Changeset 3530:8ca4bb4cc5b0 in roaraudio for roard/req.c

Timestamp:

02/19/10 18:09:41 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to give scale parameter to roarctl

File:

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

roard/req.c

@@ -737 +737 @@
 
 int req_on_set_vol (int client, struct roar_message * mes, char * data) {
+ struct roar_stream_server * s;
  uint16_t * info = (uint16_t *) mes->data;
+ uint16_t   version;
+ uint16_t   scale = 65535;
  int stream;
- struct roar_stream_server * s;
  int i;
  int chans;
@@ -749 +751 @@
   return -1;
 
- if ( info[0] != 0 ) // version
-  return -1;
-
- stream = ROAR_NET2HOST16(info[1]);
+ version = ROAR_NET2HOST16(info[0]);
+ ROAR_DBG("req_on_set_vol(*): version=%i", (int)version);
+
+ switch (version) {
+  case 0:
+    stream = ROAR_NET2HOST16(info[1]);
+   break;
+  case 1:
+    stream = mes->stream;
+    scale  = ROAR_NET2HOST16(info[1]);
+   break;
+  default:
+    return -1;
+   break;
+ }
  ROAR_DBG("req_on_set_vol(*): stream=%i", stream);
 
@@ -785 +798 @@
   }
 
+  s->mixer.scale = scale;
+
   ROAR_DBG("req_on_set_vol(*): mixer changed!");
 
@@ -793 +808 @@
 
   s->mixer.mixer[ROAR_NET2HOST16(info[3])] = ROAR_NET2HOST16(info[4]);
+
+  s->mixer.scale = scale;
  } else {
   return -1;