Changeset 3072:309781973ca8 in roaraudio for roarclients/roarctl.c

Timestamp:

01/03/10 20:25:29 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cleanup of code, use roar_stream_new_by_id()

File:

• roarclients/roarctl.c (modified) (6 diffs)

roarclients/roarctl.c

@@ -608 +608 @@
  int mode_i = ROAR_META_MODE_SET;
 
- memset(&s, 0, sizeof(s));
-
- s.id = id;
+ if ( roar_stream_new_by_id(&s, id) == -1 )
+  return -1;
 
 // printf("set_meta(*): mode='%s', type='%s', val='%s'\n", mode, type, val);
@@ -646 +645 @@
  char * v;
 
- memset(&s, 0, sizeof(s));
-
- s.id = id;
+ if ( roar_stream_new_by_id(&s, id) == -1 )
+  return -1;
 
  if ( (in = fopen(file, "r")) == NULL )
@@ -690 +688 @@
  struct roar_stream s;
 
- memset(&s, 0, sizeof(s));
-
- s.id = id;
+ if ( roar_stream_new_by_id(&s, id) == -1 )
+  return -1;
 
  meta.type  = roar_meta_inttype(type);
@@ -717 +714 @@
  int len;
 
- memset(&s, 0, sizeof(s));
-
- s.id = id;
+ if ( roar_stream_new_by_id(&s, id) == -1 )
+  return -1;
 
  if ( (len = roar_stream_meta_list(con, &s, types, ROAR_META_MAX_PER_STREAM)) == -1 )
@@ -738 +734 @@
  FILE * out;
 
- memset(&s, 0, sizeof(s));
-
- s.id = id;
+ if ( roar_stream_new_by_id(&s, id) == -1 )
+  return -1;
 
  if ( (out = fopen(file, "w")) == NULL )
@@ -774 +769 @@
  struct roar_stream s[1];
 
- memset(s, 0, sizeof(struct roar_stream));
-
- s->id = id;
+ if ( roar_stream_new_by_id(s, id) == -1 )
+  return -1;
 
  c = strtok(flags, ",");