Changeset 4740:f3abf82e2ead in roaraudio for libroar

Timestamp:

01/31/11 02:21:19 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for UNMAPPED volume control (Closes: #55)

Location:

libroar

Files:

• ctl.c (modified) (2 diffs)
• vs.c (modified) (2 diffs)

libroar/ctl.c

@@ -228 +228 @@
 
 int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels) {
+ return roar_set_vol2(con, id, mixer, channels, ROAR_SET_VOL_ALL);
+}
+
+int roar_set_vol2     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) {
  struct roar_message m;
  uint16_t * info = (uint16_t *) m.data;
@@ -239 +243 @@
  info[0] = ROAR_HOST2NET16(1);
  info[1] = ROAR_HOST2NET16(mixer->scale);
- info[2] = ROAR_HOST2NET16(ROAR_SET_VOL_ALL);
+ info[2] = ROAR_HOST2NET16(mode);
 
  for (i = 0; i < channels; i++)

libroar/vs.c

@@ -829 +829 @@
  int oldchannels;
  int handled;
+ int mode = ROAR_SET_VOL_ALL;
 
  _ckvss(-1);
@@ -864 +865 @@
  mixer.scale = 65535;
 
- 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 ) {
+ if ( channels != oldchannels )
+  mode = ROAR_SET_VOL_UNMAPPED;
+
+ if ( roar_set_vol2(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == 0 )
+  return 0;
+
+ if ( mode == ROAR_SET_VOL_ALL ) {
+  _seterrre();
+  return -1;
+ }
+
+ if ( roar_conv_volume(&mixer, &mixer, oldchannels, channels) == -1 ) {
+  _seterrre();
+  return -1;
+ }
+
+ channels = oldchannels;
+ mode     = ROAR_SET_VOL_ALL;
+
+ if ( roar_set_vol2(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == -1 ) {
   _seterrre();
   return -1;