Changeset 2150:8809a7d0167c in roaraudio

Timestamp:

07/24/09 16:28:26 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to change software volume on a output stream

File:

• roard/streams.c (modified) (3 diffs)

roard/streams.c

@@ -1160 +1160 @@
  void  * obuf;
  int     olen;
- int     need_to_free = 0;
- int     is_the_same  = 1;
+ int     need_to_free    = 0;
+ int     is_the_same     = 1;
+ int     is_vol_eq       = 1;
  ssize_t ret;
 
@@ -1208 +1209 @@
   is_the_same = 0;
 
- if ( !is_the_same ) {
+ if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) ) {
+  is_vol_eq = need_vol_change(g_sa->channels, &(ss->mixer)) ? 0 : 1;
+ }
+
+ if ( !is_the_same || !is_vol_eq ) {
   olen = ROAR_OUTPUT_CALC_OUTBUFSIZE(&(s->info)); // we hope g_output_buffer_len
                                                   // is ROAR_OUTPUT_CALC_OUTBUFSIZE(g_sa) here
@@ -1227 +1232 @@
 
  ip = g_output_buffer;
+
+ if ( !is_vol_eq ) {
+  if ( change_vol(obuf, g_sa->bits, ip, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels, &(ss->mixer)) == -1 ) {
+   _return(-1);
+  }
+
+  ip = obuf;
+ }
 
  if ( !is_the_same ) {