Changeset 2507:946700cef0b8 in roaraudio


Ignore:
Timestamp:
08/24/09 18:04:48 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

make cdriver support in roard optional, disable it on --minimal

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • configure

    r2506 r2507  
    378378   WITHOUT_VIO="$WITHOUT_VIO"' dstr cmd stdio' 
    379379   WITHOUT_CF="$WITHOUT_CF"' wave' 
    380    WITHOUT_DCOMP="$WITHOUT_DCOMP"' sources ssynth cb midi light raw' 
     380   WITHOUT_DCOMP="$WITHOUT_DCOMP"' sources ssynth cb midi light raw cdriver' 
    381381  ;; 
    382382  '--prefix') 
  • roard/driver.c

    r2503 r2507  
    7070  NULL, NULL, driver_sysclock_open_vio}, 
    7171#endif 
     72#ifndef ROAR_WITHOUT_DCOMP_CDRIVER 
    7273 {"cdriver", "RoarAudio Client driver", "driver#device", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM, 
    7374  NULL, NULL, driver_cdriver_open}, 
     75#endif 
    7476 {NULL, NULL, NULL, DRV_FLAG_NONE, 0, NULL, NULL, NULL} // end of list 
    7577                                }; 
     
    249251 
    250252 
     253#ifndef ROAR_WITHOUT_DCOMP_CDRIVER 
    251254int driver_cdriver_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    252255 char * driver; 
     
    279282 return ret; 
    280283} 
     284#endif 
    281285 
    282286//ll 
  • roard/include/driver.h

    r2367 r2507  
    125125 
    126126// opening a cdriver 
     127#ifndef ROAR_WITHOUT_DCOMP_CDRIVER 
    127128int driver_cdriver_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 
     129#endif 
    128130 
    129131#endif 
  • roard/include/sources.h

    r2488 r2507  
    6363int sources_add_roar (char * driver, char * device, char * container, char * options, int primary); 
    6464 
     65#ifndef ROAR_WITHOUT_DCOMP_CDRIVER 
    6566int sources_add_cdriver (int stream   , char * device, int fh, char * driver); 
     67#endif 
    6668#endif 
    6769 
  • roard/sources.c

    r2485 r2507  
    3434 {"cf",   "Old CF source",               "/some/file.ext", SRC_FLAG_NONE,  ROAR_SUBSYS_WAVEFORM, sources_add_cf,   NULL}, 
    3535 {"roar", "Old simple RoarAudio source", "some.host",      SRC_FLAG_NONE,  ROAR_SUBSYS_WAVEFORM, sources_add_roar, NULL}, 
     36#ifndef ROAR_WITHOUT_DCOMP_CDRIVER 
    3637 {"oss",  "OSS CDriver",                 "/dev/audio",     SRC_FLAG_NONE,  ROAR_SUBSYS_WAVEFORM, NULL, sources_add_cdriver}, 
     38#endif 
    3739 {NULL, NULL, NULL, SRC_FLAG_NONE, 0, NULL, NULL} // EOL 
    3840}; 
     
    422424} 
    423425 
     426#ifndef ROAR_WITHOUT_DCOMP_CDRIVER 
    424427int sources_add_cdriver (int stream   , char * device, int fh, char * driver) { 
    425428 int roar_cdriver_open(struct roar_vio_calls * calls, char * name, char * dev, struct roar_audio_info * info, int dir); 
     
    441444 return streams_set_fh(stream, -2); 
    442445} 
    443  
    444446#endif 
    445447 
     448#endif 
     449 
    446450//ll 
Note: See TracChangeset for help on using the changeset viewer.