Changeset 3539:1fd530767d7b in roaraudio for roarclients

Timestamp:

02/20/10 00:48:43 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to read channel map from server

Location:

roarclients

Files:

• Makefile (modified) (1 diff)
• roarctl.c (modified) (3 diffs)

roarclients/Makefile

@@ -47 +47 @@
         $L
 roarctl: roarctl.o
-        $L $(lib_m)
+        $L $(LIBROARDSP) $(lib_m)
 roarmon: roarmon.o
         $L

roarclients/roarctl.c

@@ -28 +28 @@
 #include <roaraudio.h>
 #include <roaraudio/units.h>
+#include <libroardsp/libroardsp.h>
 
 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_SETUID)
@@ -298 +299 @@
  int num;
  int id[ROAR_STREAMS_MAX];
+ char chanmap[ROAR_MAX_CHANNELS];
  struct roar_stream s;
  struct roar_stream_info info;
- char flags[1024];
- char name[1024];
+ char buffer[1024];
+ char * flags = buffer;
+ char * name  = buffer;
  char * infotext;
+ size_t len;
 
 
@@ -420 +424 @@
   }
 
+  if ( g_verbose ) {
+   len = ROAR_MAX_CHANNELS;
+   if ( roar_stream_get_chanmap(con, &s, chanmap, &len) == -1 ) {
+    fprintf(stderr, "Error: can not get stream channel map\n");
+   } else {
+    if ( roardsp_chanlist2str(chanmap, len, buffer, 1024) == -1 ) {
+     fprintf(stderr, "Error: can not convert channel map into string\n");
+    } else {
+     printf("Channel Map           : %s\n", buffer);
+    }
+   }
+  }
+
   if ( s.dir != ROAR_DIR_THRU ) {
    display_mixer(con, id[i]);