Changeset 3529:fba86b5b08a7 in roaraudio for roard/req.c

Timestamp:

02/19/10 17:36:33 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to read complet mixer from roard, including scale and rpg

File:

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

roard/req.c

@@ -808 +808 @@
 int req_on_get_vol (int client, struct roar_message * mes, char * data) {
  uint16_t * info = (uint16_t *) mes->data;
+ uint16_t   version = -1;
  int stream;
  struct roar_stream_server * s;
@@ -816 +817 @@
  ROAR_DBG("req_on_get_vol(*): mes->datalen=%i", mes->datalen);
 
- if ( mes->datalen < (2*2) )
-  return -1;
-
- if ( info[0] != 0 ) // version
-  return -1;
-
- stream = ROAR_NET2HOST16(info[1]);
+ if ( mes->datalen < 2 ) {
+  return -1;
+ }
+
+ version = ROAR_NET2HOST16(info[0]);
+
+ switch (version) {
+  case 0:
+    if ( mes->datalen < (2*2) )
+     return -1;
+
+    stream = ROAR_NET2HOST16(info[1]);
+   break;
+  case 1:
+    stream = mes->stream;
+   break;
+  default:
+    return -1;
+   break;
+ }
+
  ROAR_DBG("req_on_get_vol(*): stream=%i", stream);
 
@@ -841 +856 @@
  // ok, we have everything
 
- info[0] = 0;
- info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
-
- for (i = 0; i < chans; i++)
-  info[2+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
-
- mes->datalen = (2 + chans)*2;
+ info[0] = ROAR_HOST2NET16(version);
+
+ switch (version) {
+  case 0:
+    info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
+
+    for (i = 0; i < chans; i++)
+     info[2+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
+
+     mes->datalen = (2 + chans)*2;
+   break;
+  case 1:
+    info[1] = ROAR_HOST2NET16(chans = ROAR_STREAM(s)->info.channels);
+    info[2] = ROAR_HOST2NET16(s->mixer.scale);
+    info[3] = ROAR_HOST2NET16(s->mixer.rpg_mul);
+    info[4] = ROAR_HOST2NET16(s->mixer.rpg_div);
+
+    for (i = 0; i < chans; i++)
+     info[5+i] = ROAR_HOST2NET16(s->mixer.mixer[i]);
+
+     mes->datalen = (5 + chans)*2;
+   break;
+  default:
+    return -1;
+   break;
+ }
+
  mes->cmd = ROAR_CMD_OK;