Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f1bb334

Browse files
Use variables from module cd instead of CD.
1 parent d8953cb commit f1bb334

5 files changed

Lines changed: 21 additions & 22 deletions

File tree

Demo/sgi/cd/cdaiff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import readcd
33
import aifc
44
import AL
5-
import CD
5+
import cd
66

77
Error = 'cdaiff.Error'
88

@@ -26,7 +26,7 @@ def main():
2626
r.appendstretch(x[0], x[1])
2727
except TypeError:
2828
r.appendtrack(x)
29-
r.setcallback(CD.AUDIO, writeaudio, a)
29+
r.setcallback(cd.audio, writeaudio, a)
3030
r.play()
3131
a.close()
3232

Demo/sgi/cd/cdwin.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Window interface to (some of) the CD player's vital audio functions
22

33
import cd
4-
import CD
54
import stdwin
65
from stdwinevents import *
76
import mainloop
@@ -44,9 +43,9 @@ def but1(win):
4443

4544
def but2(win):
4645
state = win.player.getstatus()[0]
47-
if state == CD.READY:
46+
if state == cd.ready:
4847
win.player.play(1, 1)
49-
elif state in (CD.PLAYING, CD.PAUSED):
48+
elif state in (cd.playing, cd.paused):
5049
win.player.togglepause()
5150
else:
5251
stdwin.fleep()

Demo/sgi/cd/playcd.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def prstatus(status):
5050
print 'Future:', dummy
5151

5252
def main():
53-
import sys, readcd, al, AL, CD, cdplayer
53+
import sys, readcd, al, AL, cd, cdplayer
5454
verbose = 0
5555
r = readcd.Readcd()
5656
prstatus(r.getstatus())
@@ -84,13 +84,13 @@ def main():
8484
for i in range(8):
8585
r.setcallback(i, callback, None)
8686
if verbose:
87-
r.setcallback(CD.PTIME, tcallback, None)
88-
r.setcallback(CD.ATIME, tcallback, None)
87+
r.setcallback(cd.ptime, tcallback, None)
88+
r.setcallback(cd.atime, tcallback, None)
8989
else:
90-
r.removecallback(CD.PTIME)
91-
r.removecallback(CD.ATIME)
92-
r.setcallback(CD.PNUM, prtrack, cdinfo)
93-
r.setcallback(CD.AUDIO, playaudio, port)
90+
r.removecallback(cd.ptime)
91+
r.removecallback(cd.atime)
92+
r.setcallback(cd.pnum, prtrack, cdinfo)
93+
r.setcallback(cd.audio, playaudio, port)
9494

9595
data = r.play()
9696
except KeyboardInterrupt:

Demo/sgi/cd/recvcd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import al, AL
55
from socket import *
6-
from CD import CDDA_DATASIZE
6+
from cd import DATASIZE
77

88
PORT = 50505 # Must match the port in sendcd.py
99

@@ -23,7 +23,7 @@ def main():
2323
port = al.openport('CD Player', 'w', config)
2424

2525
while 1:
26-
data = s.recv(CDDA_DATASIZE)
26+
data = s.recv(DATASIZE)
2727
if not data:
2828
print 'EOF'
2929
break

Demo/sgi/cd/sendcd.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ def main():
5151
print 'socket connected'
5252

5353
parser = cd.createparser()
54-
parser.setcallback(0, audiocallback, port)
55-
parser.setcallback(1, pnumcallback, player)
56-
parser.setcallback(2, indexcallback, None)
57-
## 3 = ptime: too many calls
58-
## 4 = atime: too many calls
59-
parser.setcallback(5, catalogcallback, None)
60-
parser.setcallback(6, identcallback, None)
61-
parser.setcallback(7, controlcallback, None)
54+
parser.setcallback(cd.audio, audiocallback, port)
55+
parser.setcallback(cd.pnum, pnumcallback, player)
56+
parser.setcallback(cd.index, indexcallback, None)
57+
## cd.ptime: too many calls
58+
## cd.atime: too many calls
59+
parser.setcallback(cd.catalog, catalogcallback, None)
60+
parser.setcallback(cd.ident, identcallback, None)
61+
parser.setcallback(cd.control, controlcallback, None)
6262

6363
if len(args) >= 2:
6464
if len(args) >= 3:

0 commit comments

Comments
 (0)