Changeset 90:a4dbc92ef913 in roaraudio

Timestamp:

07/13/08 01:02:28 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a lot of basic meta stuff

Location:

roard

Files:

• include/meta.h (modified) (1 diff)
• meta.c (modified) (1 diff)
• streams.c (modified) (1 diff)

roard/include/meta.h

@@ -6 +6 @@
 #include <roaraudio.h>
 
+int stream_meta_set   (int id, int type, char * name, char * val);
+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_clear (int id);
+
 #endif
 

roard/meta.c

@@ -3 +3 @@
 #include "roard.h"
 
+int stream_meta_set   (int id, int type, char * name, char * val) {
+ int i;
+ struct roar_stream_server * s = g_streams[id];
+
+ if ( s == NULL )
+  return -1;
+
+ for (i = 0; i < ROAR_META_MAX_PER_STREAM; i++)
+  if ( s->meta[i].type == type ) {
+   s->meta[i].type = ROAR_META_TYPE_NONE;
+   if ( s->meta[i].value )
+    free(s->meta[i].value);
+   s->meta[i].value = NULL;
+  }
+
+ return stream_meta_add(id, type, name, val);
+}
+
+int stream_meta_add   (int id, int type, char * name, char * val) {
+ int i;
+ char * c;
+ struct roar_stream_server * s = g_streams[id];
+
+ if ( s == NULL )
+  return -1;
+
+ for (i = 0; i < ROAR_META_MAX_PER_STREAM; i++) {
+  if ( s->meta[i].type == ROAR_META_TYPE_NONE ) {
+   s->meta[i].type = type;
+
+   if ( name == NULL ) {
+    s->meta[i].key[0] = 0;
+   } else {
+    strncpy(s->meta[i].key, name, ROAR_META_MAX_NAMELEN);
+   }
+
+   if ( (c = malloc(strlen(val))) == NULL ) {
+    s->meta[i].type = ROAR_META_TYPE_NONE;
+    s->meta[i].key[0] = 0;
+    return -1;
+   }
+
+   strcpy(c, val);
+   s->meta[i].value = c;
+
+   return 0;
+  }
+ }
+
+ return -1;
+}
+
+int stream_meta_get   (int id, int type, char * name, char * val, size_t len) {
+ int i;
+ struct roar_stream_server * s = g_streams[id];
+
+ if ( s == NULL )
+  return -1;
+
+ for (i = 0; i < ROAR_META_MAX_PER_STREAM; i++) {
+  if ( s->meta[i].type == type ) {
+   if ( name != NULL )
+    if ( strncmp(s->meta[i].key, name, ROAR_META_MAX_NAMELEN) != 0 )
+     continue;
+
+   if ( strlen(s->meta[i].value) > (len - 1) )
+    return -1;
+
+   strcpy(val, s->meta[i].value);
+
+   return 0;
+  }
+ }
+
+ return -1;
+}
+
+int stream_meta_clear (int id) {
+ int i;
+ struct roar_stream_server * s = g_streams[id];
+
+ if ( s == NULL )
+  return -1;
+
+ for (i = 0; i < ROAR_META_MAX_PER_STREAM; i++) {
+  s->meta[i].type   = ROAR_META_TYPE_NONE;
+  if ( s->meta[i].value )
+   free(s->meta[i].value);
+  s->meta[i].value  = NULL;
+  s->meta[i].key[0] = 0;
+ }
+
+ return 0;
+}
+
 //ll

roard/streams.c

@@ -53 +53 @@
    for (j = 0; j < ROAR_MAX_CHANNELS; j++)
     ((struct roar_stream_server*)n)->mixer.mixer[j] = 65535;
-   for (j = 0; j < ROAR_META_MAX_PER_STREAM; j++)
-    ((struct roar_stream_server*)n)->meta[j].type = ROAR_META_TYPE_NONE;
+   for (j = 0; j < ROAR_META_MAX_PER_STREAM; j++) {
+    ((struct roar_stream_server*)n)->meta[j].type   = ROAR_META_TYPE_NONE;
+    ((struct roar_stream_server*)n)->meta[j].key[0] = 0;
+    ((struct roar_stream_server*)n)->meta[j].value  = NULL;
+   }
 
    g_streams[i] = (struct roar_stream_server*)n;