Changeset 822:670d196e35e8 in roaraudio for libroar/cdrom.c
- Timestamp:
- 09/18/08 23:52:02 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/cdrom.c
r821 r822 39 39 #if BYTE_ORDER == BIG_ENDIAN 40 40 #define ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT "--output-raw-big-endian" 41 #elif BYTE_ORDER == LITTLE_ENDIA 41 #elif BYTE_ORDER == LITTLE_ENDIAN 42 42 #define ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT "--output-raw-little-endian" 43 43 #endif … … 49 49 int fh[2]; 50 50 51 ROAR_DBG("roar_cdrom_run_cdparanoia(cdrom=%i, data=%i, track=%i, pos='%s') = ?", cdrom, data, track, pos); 52 51 53 if ( cdrom == -1 || data == -1 || (track == -1 && pos == NULL) || (track != -1 && pos != NULL) ) 52 54 return -1; … … 80 82 } 81 83 82 execl(ROAR_HAVE_BIN_CDPARANOIA, "cdparanoia", ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT, pos, "-", NULL); 84 // new close our backups: 85 close(fh[0]); 86 close(fh[1]); 87 88 execl(ROAR_HAVE_BIN_CDPARANOIA, "cdparanoia", "--force-cdrom-device", "/dev/stdin", "-q", 89 ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT, pos, "-", NULL); 83 90 84 91 ROAR_CDROM_ERROR_NORETURN("We are still alive after exec()!, very bad!, error was: %s", strerror(errno)); 85 92 return -1; 86 93 #else 94 #ifndef ROAR_HAVE_BIN_CDPARANOIA 95 ROAR_ERR("roar_cdrom_run_cdparanoia(*): ROAR_HAVE_BIN_CDPARANOIA not defined!"); 96 #endif 97 #ifndef ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT 98 ROAR_ERR("roar_cdrom_run_cdparanoia(*): ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT not defined!"); 99 #endif 100 ROAR_ERR("roar_cdrom_run_cdparanoia(cdrom=%i, data=%i, track=%i, pos='%s') = -1 // no cdparanoia support compiled in", 101 cdrom, data, track, pos); 87 102 return -1; 88 103 #endif … … 184 199 } 185 200 201 if ( roar_cdrom_run_cdparanoia(cdrom->fh, stream_fh, track, NULL) != -1 ) { 202 return 0; 203 } 204 186 205 close(stream_fh); 187 206
Note: See TracChangeset
for help on using the changeset viewer.