Use variables from module cd instead of CD.

diff --git a/Demo/sgi/cd/cdaiff.py b/Demo/sgi/cd/cdaiff.py
index e66f6a4d2f104602b4270afe29b5e7c6a2de1ef3..a1b490f4ab370a2f702a6ddcb33fd37b19bbc5ea 100755 (executable)
--- a/Demo/sgi/cd/cdaiff.py
+++ b/Demo/sgi/cd/cdaiff.py
@@ -2,7 +2,7 @@ import sys
 import readcd
 import aifc
 import AL
-import CD
+import cd
 
 Error = 'cdaiff.Error'
 
@@ -26,7 +26,7 @@ def main():
                        r.appendstretch(x[0], x[1])
                except TypeError:
                        r.appendtrack(x)
-       r.setcallback(CD.AUDIO, writeaudio, a)
+       r.setcallback(cd.audio, writeaudio, a)
        r.play()
        a.close()
 

diff --git a/Demo/sgi/cd/cdwin.py b/Demo/sgi/cd/cdwin.py
index 1a562c2a968cdeecd2b9803f53bf5d9abcf079bb..284ad825ea939e696abb4c340a998e06f34f050f 100755 (executable)
--- a/Demo/sgi/cd/cdwin.py
+++ b/Demo/sgi/cd/cdwin.py
@@ -1,7 +1,6 @@
 # Window interface to (some of) the CD player's vital audio functions
 
 import cd
-import CD
 import stdwin
 from stdwinevents import *
 import mainloop
@@ -44,9 +43,9 @@ def but1(win):
 
 def but2(win):
        state = win.player.getstatus()[0]
-       if state == CD.READY:
+       if state == cd.ready:
                win.player.play(1, 1)
-       elif state in (CD.PLAYING, CD.PAUSED):
+       elif state in (cd.playing, cd.paused):
                win.player.togglepause()
        else:
                stdwin.fleep()

diff --git a/Demo/sgi/cd/playcd.py b/Demo/sgi/cd/playcd.py
index b245ff0293bf32853835a54a546d1ec9c029db64..44fa5a0697ca755fcc0586c1675c6ed779852f7e 100755 (executable)
--- a/Demo/sgi/cd/playcd.py
+++ b/Demo/sgi/cd/playcd.py
@@ -50,7 +50,7 @@ def prstatus(status):
        print 'Future:', dummy
 
 def main():
-       import sys, readcd, al, AL, CD, cdplayer
+       import sys, readcd, al, AL, cd, cdplayer
        verbose = 0
        r = readcd.Readcd()
        prstatus(r.getstatus())
@@ -84,13 +84,13 @@ def main():
                for i in range(8):
                        r.setcallback(i, callback, None)
                if verbose:
-                       r.setcallback(CD.PTIME, tcallback, None)
-                       r.setcallback(CD.ATIME, tcallback, None)
+                       r.setcallback(cd.ptime, tcallback, None)
+                       r.setcallback(cd.atime, tcallback, None)
                else:
-                       r.removecallback(CD.PTIME)
-                       r.removecallback(CD.ATIME)
-               r.setcallback(CD.PNUM, prtrack, cdinfo)
-               r.setcallback(CD.AUDIO, playaudio, port)
+                       r.removecallback(cd.ptime)
+                       r.removecallback(cd.atime)
+               r.setcallback(cd.pnum, prtrack, cdinfo)
+               r.setcallback(cd.audio, playaudio, port)
 
                data = r.play()
        except KeyboardInterrupt:

diff --git a/Demo/sgi/cd/recvcd.py b/Demo/sgi/cd/recvcd.py
index db5cc412a206b7532b0979b1045d2181480706cb..e7496d19251b4688bd493de05d02220ebe7353be 100755 (executable)
--- a/Demo/sgi/cd/recvcd.py
+++ b/Demo/sgi/cd/recvcd.py
@@ -3,7 +3,7 @@
 
 import al, AL
 from socket import *
-from CD import CDDA_DATASIZE
+from cd import DATASIZE
 
 PORT = 50505                           # Must match the port in sendcd.py
 
@@ -23,7 +23,7 @@ def main():
                port = al.openport('CD Player', 'w', config)
 
                while 1:
-                       data = s.recv(CDDA_DATASIZE)
+                       data = s.recv(DATASIZE)
                        if not data:
                                print 'EOF'
                                break

diff --git a/Demo/sgi/cd/sendcd.py b/Demo/sgi/cd/sendcd.py
index 850f6a55e2ec8a101cf87d57d73aaab72b1bb90d..a6cf8e76a670ff648dd829dea37ecf1cd38d1fba 100755 (executable)
--- a/Demo/sgi/cd/sendcd.py
+++ b/Demo/sgi/cd/sendcd.py
@@ -51,14 +51,14 @@ def main():
        print 'socket connected'
 
        parser = cd.createparser()
-       parser.setcallback(0, audiocallback, port)
-       parser.setcallback(1, pnumcallback, player)
-       parser.setcallback(2, indexcallback, None)
-       ## 3 = ptime: too many calls
-       ## 4 = atime: too many calls
-       parser.setcallback(5, catalogcallback, None)
-       parser.setcallback(6, identcallback, None)
-       parser.setcallback(7, controlcallback, None)
+       parser.setcallback(cd.audio, audiocallback, port)
+       parser.setcallback(cd.pnum, pnumcallback, player)
+       parser.setcallback(cd.index, indexcallback, None)
+       ## cd.ptime: too many calls
+       ## cd.atime: too many calls
+       parser.setcallback(cd.catalog, catalogcallback, None)
+       parser.setcallback(cd.ident, identcallback, None)
+       parser.setcallback(cd.control, controlcallback, None)
 
        if len(args) >= 2:
                if len(args) >= 3: