Changeset 2079:1f7b34848f37 in roaraudio

Timestamp:

07/19/09 06:28:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for volume change in new fillmixbuf function

File:

• roard/streams.c (modified) (1 diff)

roard/streams.c

@@ -895 +895 @@
    memset(outdata+inlen, 0, outlen-inlen);
 
+  if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) ) {
+   if ( change_vol(outdata, info->bits, outdata, 8*outlen / info->bits, info->channels, &(ss->mixer)) == -1 )
+    return -1;
+  }
+
   return 0;
  } else {
-  if ( roar_conv(outdata, indata, 8*inlen / stream_info->bits, stream_info, info) == -1 ) {
+  if ( roar_conv(outdata, indata, (8*inlen_got*info->rate)/(stream_info->rate * stream_info->bits), stream_info, info) == -1 ) {
    return -1;
   }
 
 //  memset(outdata, 0, outlen);
+ }
+
+ if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) ) {
+  if ( change_vol(outdata, info->bits, outdata, 8*outlen / info->bits, info->channels, &(ss->mixer)) == -1 )
+   return -1;
  }