Changeset 2738:6ac10ee7a131 in roaraudio

Timestamp:

09/21/09 01:39:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

volume change support: stereo -> 3.1, 5.1, 6.1

File:

• roarclients/roarctl.c (modified) (4 diffs)

roarclients/roarctl.c

@@ -411 +411 @@
  int len;
  int old_chans;
- int vol_l, vol_r;
+ int vol_l, vol_r, vol_mono;
  char * k;
  struct roar_mixer_settings mixer;
@@ -435 +435 @@
 
   if ( *cur + 1 > max )
+   return -1;
+
+  k   = arg[++(*cur)];
+  len = strlen(k);
+
+  if ( k[len - 1] == '%' ) {
+   k[len - 1] = 0;
+   vol_mono = (atof(k)*65535)/100;
+  } else {
+   vol_mono = atoi(k);
+  }
+
+  for (i = 0; i < old_chans; i++)
+   mixer.mixer[i] = vol_mono;
+
+  chans = old_chans;
+
+ } else if ( strcmp(k, "stereo") == 0 && old_chans != 2 ) {
+  chans = old_chans;
+
+  if ( *cur + 2 > max )
    return -1;
 
@@ -447 +468 @@
   }
 
-  for (i = 0; i < old_chans; i++)
-   mixer.mixer[i] = vol_l;
-
-  chans = old_chans;
-
- } else if ( strcmp(k, "stereo") == 0 && old_chans == 4 ) {
-  chans = 4;
-
-  if ( *cur + 2 > max )
-   return -1;
-
-  k   = arg[++(*cur)];
-  len = strlen(k);
-
-  if ( k[len - 1] == '%' ) {
-   k[len - 1] = 0;
-   vol_l = (atof(k)*65535)/100;
-  } else {
-   vol_l = atoi(k);
-  }
-
   k   = arg[++(*cur)];
   len = strlen(k);
@@ -478 +478 @@
   }
 
+  vol_mono = (vol_l + vol_r) / 2;
+
   mixer.mixer[0] = vol_l;
   mixer.mixer[1] = vol_r;
-  mixer.mixer[2] = vol_l;
-  mixer.mixer[3] = vol_r;
-
- } else if ( strcmp(k, "stereo") == 0 && old_chans != 2 ) {
-  chans = 2;
-//  printf("mode: stereo; chans=%i, old_chans=%i\n", chans, old_chans);
-  ROAR_ERR("mode stereo not supported");
-  return -1;
+
+  switch (chans) {
+   case 3:
+     mixer.mixer[2] = vol_mono;
+    break;
+   case 4:
+     mixer.mixer[2] = vol_l;
+     mixer.mixer[3] = vol_r;
+    break;
+   case 5:
+     mixer.mixer[2] = vol_mono;
+     mixer.mixer[3] = vol_l;
+     mixer.mixer[4] = vol_r;
+    break;
+   case 6:
+     mixer.mixer[2] = vol_mono;
+     mixer.mixer[3] = vol_mono;
+     mixer.mixer[4] = vol_l;
+     mixer.mixer[5] = vol_r;
+    break;
+   default:
+     ROAR_ERR("mode stereo not supported");
+     return -1;
+    break;
+  }
+
  } else {
   if ( strcmp(k, "mono") == 0 ) {