Changeset 4118:f4b311f1ff93 in roaraudio


Ignore:
Timestamp:
08/08/10 14:26:30 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed outstanding bug about the volume not set correctly (now: pre-conv)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/streams.c

    r4111 r4118  
    11551155#endif 
    11561156 
     1157 // TODO: this only works in case a we have a amp for the given stream parameters. 
     1158 if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) && !streams_get_flag(id, ROAR_FLAG_PASSMIXER) ) { 
     1159  ROAR_DBG("streams_fill_mixbuffer2(*): CALL roar_amp_pcm(*)..."); 
     1160  if ( roar_amp_pcm(outdata, info->bits, indata, 8*inlen / stream_info->bits, stream_info->channels, &(ss->mixer)) == -1 ) 
     1161   return -1; 
     1162 } 
     1163 
    11571164 // check codec, bits, channels, rate... 
    11581165 if ( is_the_same ) { 
     
    11771184  memcpy(outdata, bufdata, outlen); 
    11781185  roar_buffer_free(bufbuf); 
    1179  } 
    1180  
    1181  if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) && !streams_get_flag(id, ROAR_FLAG_PASSMIXER) ) { 
    1182   ROAR_DBG("streams_fill_mixbuffer2(*): CALL roar_amp_pcm(*)..."); 
    1183   if ( roar_amp_pcm(outdata, info->bits, outdata, 8*outlen / info->bits, info->channels, &(ss->mixer)) == -1 ) 
    1184    return -1; 
    11851186 } 
    11861187 
Note: See TracChangeset for help on using the changeset viewer.