Changeset 824:1d4fa470c517 in roaraudio for libroar/cdrom.c

Timestamp:

09/19/08 00:08:43 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

remeber pid of playing process, kill on stop, stop on close

File:

• libroar/cdrom.c (modified) (5 diffs)

libroar/cdrom.c

@@ -34 +34 @@
 
 #include "libroar.h"
+#include <sys/types.h>
+#include <signal.h>
 
 #define ROAR_CDROM_ERROR_NORETURN(format, args...) ROAR_ERR(format, ## args); _exit(3)
@@ -124 +126 @@
  cdrom->stream     = -1;
  cdrom->play_local =  1;
+ cdrom->player     = -1;
 
  if ( (cdrom->fh = open(cdrom->device, O_RDONLY, 0644)) == -1 )
@@ -149 +152 @@
   return -1;
 
+ roar_cdrom_stop(cdrom); // stop on close
+
  if ( cdrom->fh != -1 )
   close(cdrom->fh);
@@ -173 +178 @@
  }
 
+ if ( cdrom->player != -1 )
+  kill(cdrom->player, SIGINT);
+
+ cdrom->player = -1;
  cdrom->stream = -1;
 
@@ -199 +208 @@
   }
 
-  if ( roar_cdrom_run_cdparanoia(cdrom->fh, stream_fh, track, NULL) != -1 ) {
+  if ( (cdrom->player = roar_cdrom_run_cdparanoia(cdrom->fh, stream_fh, track, NULL)) != -1 ) {
+   cdrom->stream = stream->id;
    return 0;
   }