Changeset 4538:b809f0dcd86a in roaraudio

Timestamp:

10/23/10 13:00:54 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implemented support for sending extended flags over the network

Files:

• include/libroar/stream.h (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)
• roard/req.c (modified) (3 diffs)

include/libroar/stream.h

@@ -91 +91 @@
 int roar_stream_set_chanmap (struct roar_connection * con, struct roar_stream * s, char * map, size_t   len);
 
-int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, int flags, int reset);
+int roar_stream_set_flags  (struct roar_connection * con, struct roar_stream * s, int flags, int reset);
+int roar_stream_set_flags2 (struct roar_connection * con, struct roar_stream * s, uint32_t flags, int action);
 
 int roar_stream_set_role  (struct roar_connection * con, struct roar_stream * s, int role);

libroar/stream.c

@@ -611 +611 @@
 
 int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, int flags, int reset) {
+ return roar_stream_set_flags2(con, s, flags, reset == ROAR_RESET_FLAG ? ROAR_RESET_FLAG : ROAR_SET_FLAG);
+}
+
+int roar_stream_set_flags2 (struct roar_connection * con, struct roar_stream * s, uint32_t flags, int action) {
  struct roar_message m;
  uint16_t * data = (uint16_t *) m.data;
@@ -619 +623 @@
  m.cmd     = ROAR_CMD_SET_STREAM_PARA;
  m.stream  = s->id;
- m.datalen = 8;
  m.pos     = 0;
+
+ if ( flags & 0xFFFF0000 ) {
+  m.datalen = 2*5;
+ } else {
+  m.datalen = 2*4;
+ }
 
  data[0] = 0; // Version and reserved
  data[1] = ROAR_STREAM_PARA_FLAGS; // flags
- data[2] = reset == ROAR_RESET_FLAG ? ROAR_RESET_FLAG : ROAR_SET_FLAG;
- data[3] = flags;
+ data[2] = action;
+ data[3] = flags & 0x0000FFFF;
+
+ if ( flags & 0xFFFF0000 ) {
+  data[4] = (flags & 0xFFFF0000) >> 16;
+ }
 
  for (i = 0; i < m.datalen/2; i++) {

roard/req.c

@@ -1074 +1074 @@
 int req_on_set_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
  uint16_t * d = (uint16_t *) mes->data;
+ uint32_t tmp;
  int i;
 
@@ -1088 +1089 @@
  switch (d[1]) {
   case ROAR_STREAM_PARA_FLAGS:
-    if ( mes->datalen != 2*4 )
+    if ( mes->datalen != 2*4 && mes->datalen != 2*5 )
      return -1;
 
@@ -1095 +1096 @@
 
     ROAR_DBG("req_on_set_stream_para(*): request seems to be valid");
+
+    tmp = 0;
+
+    if ( mes->datalen == 2*5 ) {
+     d[4] = ROAR_NET2HOST16(d[4]);
+     tmp   = d[4];
+     tmp <<= 16;
+    }
+
+    tmp |= d[3];
 
     if ( d[2] == ROAR_RESET_FLAG ) {