Changeset 4753:fae4e9e389bc in roaraudio


Ignore:
Timestamp:
02/05/11 17:30:53 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed depends

Location:
roard
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • roard/include/streams.h

    r4708 r4753  
    111111 int parent_stream; 
    112112 struct roar_stream_ltm ltm[MAX_LTM_WINDOWS_PER_STREAM]; 
     113#ifndef ROAR_WITHOUT_DCOMP_MIXER 
    113114 struct hwmixer_stream * mixerstream; 
     115#endif 
    114116 size_t single_sink_c; 
    115117 size_t single_sink_self_c; 
  • roard/streams.c

    r4708 r4753  
    152152   s->flags     =  ROAR_FLAG_NONE; 
    153153 
     154#ifndef ROAR_WITHOUT_DCOMP_MIXER 
    154155   s->mixerstream =  NULL; 
     156#endif 
    155157 
    156158   //roardsp_fchain_init(&(s->fc)); 
     
    260262 } 
    261263 
     264#ifndef ROAR_WITHOUT_DCOMP_MIXER 
    262265 if ( s->mixerstream != NULL ) { 
    263266  hwmixer_close(id); 
    264267 } 
     268#endif 
    265269 
    266270 //roardsp_fchain_uninit(&(s->fc)); 
     
    11751179 if ( ss->driver_id != -1 ) { 
    11761180  return driver_set_volume(id, &(ss->mixer)); 
     1181#ifndef ROAR_WITHOUT_DCOMP_MIXER 
    11771182 } else if ( ss->mixerstream != NULL ) { 
    11781183  return hwmixer_set_volume(id, ss, ss->mixerstream, &(ss->mixer)); 
     1184#endif 
    11791185 } else { 
    11801186  return 0; 
     
    13801386} 
    13811387 
     1388#ifndef ROAR_WITHOUT_DCOMP_MIXER 
    13821389struct hwmixer_stream * streams_get_mixerstream(int id) { 
    13831390 _CHECK_SID_RET(id, NULL); 
     
    14071414 return hwmixer_get_volume(id, ss, ss->mixerstream, &(ss->mixer)); 
    14081415} 
     1416#endif 
    14091417 
    14101418int streams_ctl          (int id, int_least32_t cmd, void * data) { 
Note: See TracChangeset for help on using the changeset viewer.