Update of /project/beirc/cvsroot/beirc In directory clnet:/tmp/cvs-serv6956
Modified Files: sound-player.lisp Log Message: Make sound-server functions work with sbcl:
* add :wait nil to run-program invocation, * use the sb-ext package prefix where needed, * store the process structure instead of the PID in the *s-s-pid* variable and * kill & wait for the process correctly
--- /project/beirc/cvsroot/beirc/sound-player.lisp 2006/04/07 15:43:15 1.2 +++ /project/beirc/cvsroot/beirc/sound-player.lisp 2006/04/09 09:32:42 1.3 @@ -33,9 +33,9 @@ (let ((p (sb-ext:run-program "/bin/sh" (list "-c" sound-player-cmd) - :input :stream :output nil :error nil))) - (setf sound-stream (process-input p) - pid (process-pid p))) + :input :stream :output nil :error nil :wait nil))) + (setf sound-stream (sb-ext:process-input p) + pid p)) #-(or allegro sbcl) (progn (cerror "Just reset *default-sound-player* to NIL and run without sounds." @@ -51,7 +51,9 @@ OS subprocess." (when *sound-server-pid* #+sbcl - (sb-posix:kill *sound-server-pid* sb-posix:sigkill) + (progn + (sb-ext:process-kill *sound-server-pid* sb-posix:sigkill) + (sb-ext:process-wait *sound-server-pid* t)) #+allegro (progn (close *sound-server-stream*)