Changeset 5241:766eead707a5 in roaraudio for libroar/cdrom.c
- Timestamp:
- 11/12/11 18:38:56 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/cdrom.c
r4708 r5241 87 87 } 88 88 89 // n ew close our backups:89 // now close our backups: 90 90 close(fh[0]); 91 91 close(fh[1]); … … 109 109 } 110 110 111 int roar_cdrom_open (struct roar_connection * con, struct roar_cdrom * cdrom, c har * device) {111 int roar_cdrom_open (struct roar_connection * con, struct roar_cdrom * cdrom, const char * device) { 112 112 #ifdef ROAR_HAVE_CDROM 113 113 int flags; … … 212 212 int roar_cdrom_play (struct roar_cdrom * cdrom, int track) { 213 213 #ifdef ROAR_HAVE_CDROM 214 struct roar_vio_calls vio; 215 struct roar_stream stream[1]; 214 216 int stream_fh; 215 struct roar_stream stream[1];216 217 217 218 if ( cdrom == NULL ) … … 228 229 if ( cdrom->play_local ) { 229 230 230 if ( (stream_fh = roar_simple_new_stream_obj(cdrom->con, stream, ROAR_CDROM_STREAMINFO, ROAR_DIR_PLAY)) == -1 ) { 231 if ( roar_vio_simple_new_stream_obj(&vio, cdrom->con, stream, ROAR_CDROM_STREAMINFO, ROAR_DIR_PLAY) == -1 ) { 232 return -1; 233 } 234 235 if ( roar_vio_ctl(&vio, ROAR_VIO_CTL_GET_WRITE_FH, &stream_fh) == -1 ) { 236 roar_vio_close(&vio); 231 237 return -1; 232 238 } … … 237 243 } 238 244 239 close(stream_fh);245 roar_vio_close(&vio); 240 246 241 247 return -1;
Note: See TracChangeset
for help on using the changeset viewer.