From d9feb59b328e8dee91c27fe5cca0aa15992210ee Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 22 Apr 1992 13:39:10 +0000 Subject: [PATCH] Adopted new readcd interface; caught interrupts --- Demo/sgi/cd/cdaiff.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Demo/sgi/cd/cdaiff.py b/Demo/sgi/cd/cdaiff.py index 83463a78fc5..b3b9bb07ae3 100755 --- 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()