Adopted new readcd interface; caught interrupts

diff --git a/Demo/sgi/cd/cdaiff.py b/Demo/sgi/cd/cdaiff.py
index 83463a78fc5cedb8b12412c022d46c5512e09973..b3b9bb07ae37ed701bda16c73d4246ad0214f327 100755 (executable)
--- a/Demo/sgi/cd/cdaiff.py
+++ b/Demo/sgi/cd/cdaiff.py
@@ -24,15 +24,21 @@ def main():
        a.sampwidth = AL.SAMPLE_16
        a.nchannels = AL.STEREO
        a.samprate = AL.RATE_44100
+       r = readcd.Readcd().init()
        l = []
        for arg in sys.argv[2:]:
-               l.append(eval(arg))
-       print l
-       r = readcd.Readcd().init()
-       r.set(l)
+               x = eval(arg)
+               try:
+                       l = len(x)
+                       r.appendstretch(x[0], x[1])
+               except TypeError:
+                       r.appendtrack(x)
        r.setcallback(CD.AUDIO, writeaudio, a)
        r.setcallback(CD.PTIME, ptimecallback, None)
-       r.play()
+       try:
+               r.play()
+       except KeyboardInterrupt:
+               pass
        a.destroy()
 
 main()