Changeset 4740:f3abf82e2ead in roaraudio for roard

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)

File:

• roard/req.c (modified) (2 diffs)

roard/req.c

@@ -1371 +1371 @@
 
 int req_on_set_vol (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ struct roar_mixer_settings tmpmixer;
  struct roar_stream_server * s;
  uint16_t * info = (uint16_t *) mes->data;
@@ -1450 +1451 @@
     s->mixer.scale = scale;
    break;
+  case ROAR_SET_VOL_UNMAPPED:
+    chans = (mes->datalen/2) - 3;
+
+    if ( chans >= ROAR_MAX_CHANNELS )
+     return -1;
+
+    memcpy(&tmpmixer, &(s->mixer), sizeof(tmpmixer));
+
+    for (i = 0; i < chans; i++) {
+     tmpmixer.mixer[i] = ROAR_NET2HOST16(info[i+3]);
+    }
+
+    tmpmixer.scale = scale;
+
+    if ( roar_conv_volume(&(s->mixer), &tmpmixer, ROAR_STREAM(s)->info.channels, chans) == -1 )
+     return -1;
+
+   break;
+  case ROAR_SET_VOL_MS:
   default:
     return -1;