Changeset 2285:3e05ea92950e in roaraudio


Ignore:
Timestamp:
08/04/09 16:07:53 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added driver name to parameter list of new streams, corected flag name

Location:
roard
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • roard/include/sources.h

    r2275 r2285  
    3838 unsigned int subsystems; 
    3939 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); 
    4141}; 
    4242 
     
    5757                     char * options, int primary); 
    5858 
    59 int sources_add_raw  (int stream   , char * device, int fh); 
     59int sources_add_raw  (int stream   , char * device, int fh, char * driver); 
    6060int sources_add_wav  (char * driver, char * device, char * container, char * options, int primary); 
    6161int sources_add_cf   (char * driver, char * device, char * container, char * options, int primary); 
    6262int sources_add_roar (char * driver, char * device, char * container, char * options, int primary); 
    6363 
     64int sources_add_cdriver (int stream   , char * device, int fh, char * driver); 
     65 
    6466#endif 
    6567 
  • roard/sources.c

    r2275 r2285  
    6262 
    6363  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' : ' ', 
    6565                g_source[i].old_open != NULL            ? 'S' : ' ', 
    6666                g_source[i].new_open != NULL            ? 'N' : ' ', 
     
    201201 ROAR_STREAM_SERVER(s)->codec_orgi = codec; 
    202202 
    203  if ( source->new_open(stream, device, fh) == -1 ) { 
     203 if ( source->new_open(stream, device, fh, driver) == -1 ) { 
    204204  streams_delete(stream); 
    205205  return -1; 
     
    221221} 
    222222 
    223 int sources_add_raw  (int stream   , char * device, int fh) { 
     223int sources_add_raw  (int stream   , char * device, int fh, char * driver) { 
    224224 struct roar_stream_server * ss; 
    225225 
Note: See TracChangeset for help on using the changeset viewer.