Changeset 4538:b809f0dcd86a in roaraudio for libroar/stream.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

implemented support for sending extended flags over the network

File:

• libroar/stream.c (modified) (2 diffs)

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++) {