[gsharp-cvs] CVS update: gsharp/midi.lisp

[Christophe Rhodes]

Update of /project/gsharp/cvsroot/gsharp
In directory common-lisp.net:/tmp/cvs-serv13115

Modified Files:
	midi.lisp 
Log Message:
Fix for MIDI files already existing: make WITH-MIDI-INPUT/OUTPUT 
slightly more flexible, and specify :if-exists :supersede

Date: Wed Feb 18 13:15:46 2004
Author: crhodes

Index: gsharp/midi.lisp
diff -u gsharp/midi.lisp:1.1.1.1 gsharp/midi.lisp:1.2
--- gsharp/midi.lisp:1.1.1.1	Mon Feb 16 10:46:18 2004
+++ gsharp/midi.lisp	Wed Feb 18 13:15:46 2004
@@ -105,16 +105,18 @@
     (write-fixed-length-quantity (ash quantity -8) (1- nb-bytes))
     (write-bytes (logand quantity #xff))))
 
-(defmacro with-midi-input (filename &body body)
-  "execute body with *midi-input* assigned to a stream from filename"
-  `(with-open-file (*midi-input* ,filename
-		    :direction :input :element-type '(unsigned-byte 8))
+(defmacro with-midi-input ((pathname &rest open-args &key &allow-other-keys) &body body)
+  "execute body with *midi-input* assigned to a stream from pathname"
+  `(with-open-file (*midi-input* ,pathname
+		    :direction :input :element-type '(unsigned-byte 8)
+		    , at open-args)
     , at body))
 
-(defmacro with-midi-output (filename &body body)
-  "execute body with *midi-output* assigned to a stream from filename"
-  `(with-open-file (*midi-output* ,filename
-		    :direction :output :element-type '(unsigned-byte 8))
+(defmacro with-midi-output ((pathname &rest open-args &key &allow-other-keys) &body body)
+  "execute body with *midi-output* assigned to a stream from pathname"
+  `(with-open-file (*midi-output* ,pathname
+		    :direction :output :element-type '(unsigned-byte 8)
+		    , at open-args)
     , at body))
 
 (defun read-variable-length-quantity ()
@@ -225,7 +227,7 @@
 (defun read-midi-file (filename)
   "read an entire Midifile from the file with name given as argument"
   (setf *time* 0)
-  (with-midi-input filename
+  (with-midi-input (filename)
     (let ((type (read-fixed-length-quantity 4))
 	  (length (read-fixed-length-quantity 4))
 	  (format (read-fixed-length-quantity  2))
@@ -241,7 +243,7 @@
 		      collect (read-track))))))
 
 (defun write-midi-file (midifile filename)
-  (with-midi-output filename
+  (with-midi-output (filename :if-exists :supersede)
     (write-fixed-length-quantity +header-mthd+ 4)
     (write-fixed-length-quantity  +header-mthd-length+ 4)
     (with-slots (format division tracks) midifile