Changeset 113:a032ff209b90 in roaraudio

Timestamp:

07/13/08 04:23:57 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added stream_meta_list() and done other support for listing meta tags on streams

Location:

roard

Files:

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

roard/commands.c

@@ -11 +11 @@
   {ROAR_CMD_SET_META,     "SET_META",     req_on_set_meta},
   {ROAR_CMD_GET_META,     "GET_META",     req_on_get_meta},
+  {ROAR_CMD_LIST_META,    "LIST_META",    req_on_list_meta},
 
   {ROAR_CMD_EXEC_STREAM,  "EXEC_STREAM",  req_on_exec_stream},

roard/include/meta.h

@@ -9 +9 @@
 int stream_meta_add   (int id, int type, char * name, char * val);
 int stream_meta_get   (int id, int type, char * name, char * val, size_t len);
+int stream_meta_list  (int id, int * types, size_t len);
 int stream_meta_clear (int id);
 

roard/include/req.h

@@ -17 +17 @@
 int req_on_set_meta    (int client, struct roar_message * mes, char * data);
 int req_on_get_meta    (int client, struct roar_message * mes, char * data);
+int req_on_list_meta   (int client, struct roar_message * mes, char * data);
 
 int req_on_get_standby (int client, struct roar_message * mes, char * data);

roard/meta.c

@@ -70 +70 @@
      continue;
 
+   if ( s->meta[i].value == NULL )
+    return -1;
+
    if ( (vallen = strlen(s->meta[i].value)) > (len - 1) ) {
     ROAR_DBG("stream_meta_get(*): val too small: need %i have %i", vallen, len);
@@ -83 +86 @@
 
  return -1;
+}
+
+int stream_meta_list  (int id, int * types, size_t len) {
+ int i, j;
+ int have = 0;
+ int found;
+ struct roar_stream_server * s = g_streams[id];
+
+ if ( s == NULL )
+  return -1;
+
+ if ( len < ROAR_META_MAX_PER_STREAM ) // TODO: find a way we do not need this
+  return -1;
+
+ types[0] = -1;
+
+ for (i = 0; i < ROAR_META_MAX_PER_STREAM; i++) {
+  found = 0;
+  for (j = 0; j < have; j++)
+   if ( types[j] == s->meta[i].type ) {
+    found = 1;
+    break;
+   }
+
+  if ( !found )
+   types[have++] = s->meta[i].type;
+ }
+
+ return have;
 }
 

roard/req.c

@@ -231 +231 @@
 }
 
+int req_on_list_meta   (int client, struct roar_message * mes, char * data) {
+ int i;
+ int len = 0;
+ int types[ROAR_META_MAX_PER_STREAM];
+
+ if ( mes->datalen != 1 )
+  return -1;
+
+ if ( mes->data[0] != 0 ) // version
+  return -1;
+
+ if ( (len = stream_meta_list(mes->stream, types, ROAR_META_MAX_PER_STREAM)) == -1 )
+  return -1;
+
+ mes->cmd     = ROAR_CMD_OK;
+ mes->datalen = 1 + len;
+ mes->data[0] = 0;
+
+ for (i = 0; i < len; i++)
+  mes->data[i+1] = types[i];
+
+ return 0;
+}
+
 int req_on_server_oinfo    (int client, struct roar_message * mes, char * data) {
  struct roar_stream s;