Changeset 5289:ddb3677af4d0 in roaraudio for roarclients/roarlight.c

Timestamp:

11/22/11 14:47:44 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use support to set mixer ID up at least one API layer

File:

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

roarclients/roarlight.c

@@ -35 +35 @@
 
  printf("  --server    SERVER    - Set server hostname\n"
+        "  --mixer     MIXERID   - ID of the light mixer to use\n"
         "  --help                - Show this help\n"
        );
@@ -46 +47 @@
 }
 
-int cmd_set (CONVAR, char * arg) {
+int cmd_set (CONVAR, char * arg, const int mixer) {
  char * next = arg;
  char * k, * v;
@@ -80 +81 @@
  if ( roar_vio_simple_new_stream_obj(&vio, con, NULL,
                                      ROAR_RATE_DEFAULT, ROAR_CHANNELS_DEFAULT, ROAR_BITS_DEFAULT,
-                                     ROAR_CODEC_ROARDMX, ROAR_DIR_LIGHT_IN) == -1 )
+                                     ROAR_CODEC_ROARDMX, ROAR_DIR_LIGHT_IN, mixer) == -1 )
   return -1;
 
@@ -94 +95 @@
 
 int main (int argc, char * argv[]) {
+ struct roar_connection con;
+ int    mixer = -1; // -1 = Default
  char * server   = NULL;
  char * k;
  int    i;
- struct roar_connection con;
 
  for (i = 1; i < argc; i++) {
@@ -104 +106 @@
   if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) {
    server = argv[++i];
+  } else if ( !strcmp(k, "--mixer") ) {
+   mixer = atoi(argv[++i]);
   } else if ( !strcmp(k, "--codec") ) {
 
@@ -142 +146 @@
   } else if ( !strcmp(k, "set") ) {
    i++;
-   if ( cmd_set(&con, argv[i]) == -1 ) {
+   if ( cmd_set(&con, argv[i], mixer) == -1 ) {
     fprintf(stderr, "Error: can not set channels\n");
    } else {