Changeset 2285:3e05ea92950e in roaraudio
- Timestamp:
- 08/04/09 16:07:53 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/sources.h
r2275 r2285 38 38 unsigned int subsystems; 39 39 int (*old_open)(char * driver, char * device, char * container, char * options, int primary); 40 int (*new_open)(int stream , char * device, int fh );40 int (*new_open)(int stream , char * device, int fh, char * driver); 41 41 }; 42 42 … … 57 57 char * options, int primary); 58 58 59 int sources_add_raw (int stream , char * device, int fh );59 int sources_add_raw (int stream , char * device, int fh, char * driver); 60 60 int sources_add_wav (char * driver, char * device, char * container, char * options, int primary); 61 61 int sources_add_cf (char * driver, char * device, char * container, char * options, int primary); 62 62 int sources_add_roar (char * driver, char * device, char * container, char * options, int primary); 63 63 64 int sources_add_cdriver (int stream , char * device, int fh, char * driver); 65 64 66 #endif 65 67 -
roard/sources.c
r2275 r2285 62 62 63 63 printf(" %-9s %c%c%c %6s - %s (devices: %s)\n", g_source[i].name, 64 g_source[i].flags & DRV_FLAG_FHSEC ? 's' : ' ',64 g_source[i].flags & SRC_FLAG_FHSEC ? 's' : ' ', 65 65 g_source[i].old_open != NULL ? 'S' : ' ', 66 66 g_source[i].new_open != NULL ? 'N' : ' ', … … 201 201 ROAR_STREAM_SERVER(s)->codec_orgi = codec; 202 202 203 if ( source->new_open(stream, device, fh ) == -1 ) {203 if ( source->new_open(stream, device, fh, driver) == -1 ) { 204 204 streams_delete(stream); 205 205 return -1; … … 221 221 } 222 222 223 int sources_add_raw (int stream , char * device, int fh ) {223 int sources_add_raw (int stream , char * device, int fh, char * driver) { 224 224 struct roar_stream_server * ss; 225 225
Note: See TracChangeset
for help on using the changeset viewer.