Changeset 5624:ec1593cc8525 in roaraudio for roard/req.c

Timestamp:

08/18/12 02:04:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for RePlayGain? (RPG) control (See: #300)

File:

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

roard/req.c

@@ -1118 +1118 @@
  struct roar_audio_info * audio_info;
  struct roar_stream_ltm * ltm;
+ struct roar_stream_rpg   rpg;
  uint16_t * d  = (uint16_t *) mes->data;
  int64_t * d64 = ( int64_t *) mes->data;
@@ -1348 +1349 @@
    break;
 
+  case ROAR_STREAM_PARA_RPG:
+    if ( streams_get_rpg(mes->stream, &rpg) == -1 ) {
+     return -1;
+    }
+
+    mes->datalen = 2*5;
+
+    d[2] = rpg.mode;
+    d[3] = rpg.mul;
+    d[4] = rpg.div;
+
+    for (i = 0; i < mes->datalen/2; i++) {
+     d[i] = ROAR_HOST2NET16(d[i]);
+    }
+   break;
+
   default:
     ROAR_WARN("req_on_get_stream_para(*): unsupported command: %i", d[1]);
@@ -1360 +1377 @@
 int req_on_set_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
  struct roar_stream_server * ss;
+ struct roar_stream_rpg rpg;
  uint16_t * d = (uint16_t *) mes->data;
  uint32_t tmp, tmp2, flagstore;
@@ -1470 +1488 @@
     }
    break;
+  case ROAR_STREAM_PARA_RPG:
+    if ( mes->datalen != (5 * 2) )
+     return -1;
+
+    for (i = 2; i < mes->datalen/2; i++) {
+     d[i] = ROAR_NET2HOST16(d[i]);
+    }
+
+    rpg.mode = d[2];
+    rpg.mul  = d[3];
+    rpg.div  = d[4];
+
+    if ( streams_set_rpg(mes->stream, &rpg) == -1 )
+     return -1;
+   break;
   default:
     ROAR_WARN("req_on_set_stream_para(*): unsupported command version: %i, %i", d[0], d[1]);