Changeset 99:0ef9bfdde394 in roaraudio

Timestamp:

07/13/08 02:03:24 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got meta data update working

Files:

• roarclients/roarctl.c (modified) (2 diffs)
• roard/req.c (modified) (4 diffs)

roarclients/roarctl.c

@@ -219 +219 @@
 }
 
+int set_meta (struct roar_connection * con, int id, char * mode, char * type, char * val) {
+ struct roar_meta   meta;
+ struct roar_stream s;
+ int mode_i = ROAR_META_MODE_SET;
+
+ s.id = id;
+
+ printf("set_meta(*): mode='%s', type='%s', val='%s'\n", mode, type, val);
+
+ if ( strcmp(mode, "add") == 0 ) {
+  mode_i = ROAR_META_MODE_ADD;
+ }
+
+ meta.type  = atoi(type);
+ meta.value = val;
+
+ printf("D: type=%i, mode=%i\n", meta.type, mode_i);
+
+ return roar_stream_meta_set(con, &s, mode_i, &meta);
+}
+
 int main (int argc, char * argv[]) {
  struct roar_connection con;
@@ -344 +365 @@
    }
 
+  } else if ( !strcmp(k, "meta") ) {
+   i++;
+   if ( set_meta(&con, atoi(argv[i]), argv[i+1], argv[i+2], argv[i+3]) == -1 ) {
+    fprintf(stderr, "Error: can not set meta data\n");
+   } else {
+    printf("meta data changed\n");
+   }
+   i += 3;
+
   } else {
    fprintf(stderr, "Error: invalid command: %s\n", k);

roard/req.c

@@ -138 +138 @@
  int mode;
  int namelen, vallen;
- char   val[1024+1];
+ char   val[255+1];
  char   name[ROAR_META_MAX_NAMELEN+1];
 
@@ -149 +149 @@
  mode = (unsigned) mes->data[1];
  type = (unsigned) mes->data[2];
+
+ ROAR_DBG("req_on_set_meta(*): mode=%i, type=%i", mode, type);
 
  if ( mode == ROAR_META_MODE_CLEAR ) {
@@ -163 +165 @@
   vallen  = (unsigned) mes->data[4];
 
+  ROAR_DBG("req_on_set_meta(*): namelen=%i, vallen=%i", namelen, vallen);
+
   if ( mes->datalen < (5 + namelen + vallen) )
    return -1;
@@ -172 +176 @@
   name[namelen] = 0;
 
-  if ( vallen > 1024 )
+  if ( vallen > 255 )
    return -1;