Changeset 1043:1ca27ba72398 in roaraudio for roard

Timestamp:

12/23/08 09:26:22 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to set flags via roarctl, update meta data on change of meta flag

Location:

roard

Files:

• commands.c (modified) (1 diff)
• include/req.h (modified) (1 diff)
• req.c (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/commands.c

@@ -55 +55 @@
   {ROAR_CMD_GET_VOL,      "GET_VOL",      req_on_get_vol},
   {ROAR_CMD_GET_STREAM_PARA, "GET_STREAM_PARA", req_on_get_stream_para},
+  {ROAR_CMD_SET_STREAM_PARA, "SET_STREAM_PARA", req_on_set_stream_para},
 
   {ROAR_CMD_ADD_DATA,     "ADD_DATA",     req_on_add_data},

roard/include/req.h

@@ -56 +56 @@
 
 int req_on_get_stream_para (int client, struct roar_message * mes, char * data);
+int req_on_set_stream_para (int client, struct roar_message * mes, char * data);
 
 int req_on_kick        (int client, struct roar_message * mes, char * data);

roard/req.c

@@ -501 +501 @@
 }
 
+int req_on_set_stream_para (int client, struct roar_message * mes, char * data) {
+ uint16_t * d = (uint16_t *) mes->data;
+ int i;
+
+ if ( mes->datalen != 8 )
+  return -1;
+
+ for (i = 0; i < mes->datalen/2; i++) {
+  d[i] = ROAR_NET2HOST16(d[i]);
+ }
+
+ if ( d[0] != 0 || d[1] != 2 ) {
+  ROAR_WARN("req_on_set_stream_para(*): unsupported command version: %i, %i", d[0], d[1]);
+  return -1;
+ }
+
+ mes->cmd     = ROAR_CMD_OK;
+ mes->datalen = 0;
+
+ ROAR_WARN("req_on_set_stream_para(*): request seems to be valid");
+
+ if ( d[2] == ROAR_RESET_FLAG ) {
+  return streams_reset_flag(mes->stream, d[3]);
+ } else {
+  return streams_set_flag(mes->stream, d[3]);
+ }
+
+ return -1;
+}
+
 int req_on_kick (int client, struct roar_message * mes, char * data) {
  uint16_t * info = (uint16_t *) mes->data;

roard/streams.c

@@ -267 +267 @@
   return -1;
 
+ if ( flag & ROAR_FLAG_PRIMARY ) {
+  streams_set_primary(id, 1);
+  flag -= ROAR_FLAG_PRIMARY;
+ }
+
  g_streams[id]->flags |= flag;
 
+ if ( flag & ROAR_FLAG_META )
+  stream_meta_finalize(id);
+
  return 0;
 }
@@ -275 +283 @@
  if ( g_streams[id] == NULL )
   return -1;
+
+ if ( flag & ROAR_FLAG_PRIMARY ) {
+  streams_set_primary(id, 0);
+  flag -= ROAR_FLAG_PRIMARY;
+ }
 
  g_streams[id]->flags |= flag;