Changeset 5929:e3e67f000dce in roaraudio for roarclients

Timestamp:

09/11/13 14:56:42 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improve inner structure

File:

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

roarclients/roarlight.c

@@ -29 +29 @@
 #define CONVAR struct roar_connection * con
 
+static struct roar_connection * g_connection;
+static struct roar_vio_calls  * g_stream;
+
+static int __run_argv(int argc, char * argv[]);
+
 void usage (void) {
  printf("roarlight [OPTIONS]... command [command...]\n");
@@ -47 +52 @@
 }
 
-int cmd_set (CONVAR, char * arg, const int mixer) {
+int cmd_set (char * arg) {
  char * next = arg;
  char * k, * v;
  int32_t chan, val;
  struct roar_roardmx_message mes;
- struct roar_vio_calls vio;
 
  roar_roardmx_message_new_sset(&mes);
@@ -79 +83 @@
  }
 
- 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, mixer) == -1 )
-  return -1;
-
- if ( roar_roardmx_message_send(&mes, &vio) == -1 ) {
-  roar_vio_close(&vio);
+ if ( roar_roardmx_message_send(&mes, g_stream) == -1 ) {
   return -1;
  }
 
- roar_vio_close(&vio);
+ return 0;
+}
+
+static int __run_argv(int argc, char * argv[]) {
+ char * k;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+  k = argv[i];
+  // cmd is in k
+
+  printf("--- [ %s ] ---\n", k);
+
+  if ( !strcmp(k, "help") ) {
+   usage();
+
+  } else if ( !strcmp(k, "sleep") ) {
+   roar_sleep(atoi(argv[++i]));
+
+  } else if ( !strcmp(k, "set") ) {
+   i++;
+   if ( cmd_set(argv[i]) == -1 ) {
+    fprintf(stderr, "Error: can not set channels\n");
+   } else {
+    printf("channels changed\n");
+   }
+
+  } else {
+   fprintf(stderr, "Error: invalid command: %s\n", k);
+   return 1;
+  }
+ }
 
  return 0;
@@ -96 +125 @@
 int main (int argc, char * argv[]) {
  struct roar_connection con;
+ struct roar_vio_calls vio;
  int    mixer = -1; // -1 = Default
  const char * server   = NULL;
  const char * k;
  int    i;
+ int    ret;
 
  for (i = 1; i < argc; i++) {
@@ -122 +153 @@
  }
 
+ if ( i == argc ) {
+  fprintf(stderr, "Error: No Commands given\n");
+  return 0; // this is not a fatal error...
+ }
+
  if ( roar_simple_connect(&con, server, "roarlight") == -1 ) {
   fprintf(stderr, "Error: Can not connect to server\n");
@@ -127 +163 @@
  }
 
- if ( i == argc ) {
-  fprintf(stderr, "Error: No Commands given\n");
-  return 0; // this is not a fatal error...
+ 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, mixer) == -1 ) {
  }
 
- for (; i < argc; i++) {
-  k = argv[i];
-  // cmd is in k
+ g_connection = &con;
+ g_stream = &vio;
 
-  printf("--- [ %s ] ---\n", k);
+ ret = __run_argv(argc - i, argv + i);
 
-  if ( !strcmp(k, "help") ) {
-   usage();
+ // try to flush all data:
 
-  } else if ( !strcmp(k, "sleep") ) {
-   roar_sleep(atoi(argv[++i]));
-
-  } else if ( !strcmp(k, "set") ) {
-   i++;
-   if ( cmd_set(&con, argv[i], mixer) == -1 ) {
-    fprintf(stderr, "Error: can not set channels\n");
-   } else {
-    printf("channels changed\n");
-   }
-
-  } else {
-   fprintf(stderr, "Error: invalid command: %s\n", k);
-  }
- }
+ roar_vio_sync(&vio);
+ roar_vio_close(&vio);
+ roar_usleep(100);
 
  roar_disconnect(&con);
 
- return 0;
+ return ret;
 }