Changeset 4182:b669a0fb30b8 in roaraudio

Timestamp:

08/14/10 15:47:57 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

handle setting volume even if stream has diffrent channel setup

File:

• libroar/vs.c (modified) (3 diffs)

libroar/vs.c

@@ -343 +343 @@
  size_t i;
  register float s;
+ int oldchannels;
+ int handled;
 
  if ( !(vss->flags & FLAG_STREAM) ) {
@@ -351 +353 @@
  if ( channels > ROAR_MAX_CHANNELS ) {
   _seterr(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ if ( roar_get_vol(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, &oldchannels) == -1 ) {
+  _seterr(ROAR_ERROR_UNKNOWN);
   return -1;
  }
@@ -368 +375 @@
 
  mixer.scale = 65535;
- mixer.rpg_mul = 1;
- mixer.rpg_div = 1;
+
+ if ( channels != oldchannels ) {
+  handled = 0;
+  switch (oldchannels) {
+   case 1:
+     if ( channels == 2 ) {
+      mixer.mixer[0] = (mixer.mixer[0] + mixer.mixer[1]) / 2;
+      handled = 1;
+     }
+    break;
+   case 2:
+     if ( channels == 1 ) {
+      mixer.mixer[1] = mixer.mixer[0];
+      handled = 1;
+     }
+    break;
+   case 4:
+     if ( channels == 1 ) {
+      mixer.mixer[1] = mixer.mixer[0];
+      mixer.mixer[2] = mixer.mixer[0];
+      mixer.mixer[3] = mixer.mixer[0];
+      handled = 1;
+     } else if ( channels == 2 ) {
+      mixer.mixer[2] = mixer.mixer[0];
+      mixer.mixer[3] = mixer.mixer[1];
+      handled = 1;
+     }
+    break;
+  }
+  if ( handled ) {
+   channels = oldchannels;
+  } else {
+   _seterr(ROAR_ERROR_INVAL);
+   return -1;
+  }
+ }
 
  if ( roar_set_vol(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels) == -1 ) {