Changeset 824:1d4fa470c517 in roaraudio for libroar/cdrom.c
- Timestamp:
- 09/19/08 00:08:43 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/cdrom.c
r822 r824 34 34 35 35 #include "libroar.h" 36 #include <sys/types.h> 37 #include <signal.h> 36 38 37 39 #define ROAR_CDROM_ERROR_NORETURN(format, args...) ROAR_ERR(format, ## args); _exit(3) … … 124 126 cdrom->stream = -1; 125 127 cdrom->play_local = 1; 128 cdrom->player = -1; 126 129 127 130 if ( (cdrom->fh = open(cdrom->device, O_RDONLY, 0644)) == -1 ) … … 149 152 return -1; 150 153 154 roar_cdrom_stop(cdrom); // stop on close 155 151 156 if ( cdrom->fh != -1 ) 152 157 close(cdrom->fh); … … 173 178 } 174 179 180 if ( cdrom->player != -1 ) 181 kill(cdrom->player, SIGINT); 182 183 cdrom->player = -1; 175 184 cdrom->stream = -1; 176 185 … … 199 208 } 200 209 201 if ( roar_cdrom_run_cdparanoia(cdrom->fh, stream_fh, track, NULL) != -1 ) { 210 if ( (cdrom->player = roar_cdrom_run_cdparanoia(cdrom->fh, stream_fh, track, NULL)) != -1 ) { 211 cdrom->stream = stream->id; 202 212 return 0; 203 213 }
Note: See TracChangeset
for help on using the changeset viewer.