Changeset 2242:01acf25aaeb5 in roaraudio

Timestamp:

07/28/09 04:11:29 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added --rel-id from roarmon

File:

• roarclients/roarcat.c (modified) (4 diffs)

roarclients/roarcat.c

@@ -41 +41 @@
         "  --light               - Use light control input\n"
         "  --raw                 - Use raw input\n"
+        "  --rel-id ID          - Set ID of relative stream\n"
         "  --help                - Show this help\n"
        );
@@ -52 +53 @@
  int    codec    = ROAR_CODEC_DEFAULT;
  int    dir      = ROAR_DIR_PLAY;
+ int    rel_id   = -1;
  char * server   = NULL;
  char * k;
- int    fh;
  int    i;
- int    in = -1;
  char * name = "roarcat";
- char buf[BUFSIZE];
+ struct roar_connection    con;
+ struct roar_stream        s;
+ struct roar_vio_calls     file, stream;
+ struct roar_vio_defaults  def;
+ int file_opened = 0;
 
  for (i = 1; i < argc; i++) {
@@ -96 +100 @@
    dir   = ROAR_DIR_RAW_IN;
 
+  } else if ( !strcmp(k, "--rel-id") ) {
+   rel_id = atoi(argv[++i]);
+
   } else if ( !strcmp(k, "--help") || !strcmp(k, "-h") ) {
    usage();
    return 0;
-  } else if ( in == -1 ) {
-   if ( (in = open(k, O_RDONLY, 0644)) == -1 ) {
+  } else if ( !file_opened ) {
+   file_opened = 1;
+   if ( roar_vio_open_dstr(&file, k, &def, 1) == -1 ) {
     fprintf(stderr, "Error: can not open file: %s: %s\n", k, strerror(errno));
     return 1;
@@ -111 +119 @@
  }
 
- if ( (fh = roar_simple_stream(rate, channels, bits, codec, server, dir, name)) == -1 ) {
-  fprintf(stderr, "Error: can not start playback\n");
-  return 1;
+ if ( roar_simple_connect(&con, server, "roarmon") == -1 ) {
+  fprintf(stderr, "Error: can not connect to server\n");
+  return 10;
  }
 
- if ( in == -1 )
-  in = ROAR_STDIN;
+ if ( roar_stream_new(&s, rate, channels, bits, codec) == -1 ) {
+  fprintf(stderr, "Error: can not create stream\n");
+  roar_disconnect(&con);
+  return 20;
+ }
 
- while((i = read(in, buf, BUFSIZE)))
-  if (write(fh, buf, i) != i)
-   break;
+ if ( rel_id != -1 ) {
+  if ( roar_stream_set_rel_id(&s, rel_id) ) {
+   fprintf(stderr, "Error: can not set id or realative stream\n");
+   roar_disconnect(&con);
+   return 21;
+  }
+ }
 
- roar_simple_close(fh);
+ if ( roar_stream_connect(&con, &s, dir) == -1 ) {
+  fprintf(stderr, "Error: can not connect stream to server\n");
+  roar_disconnect(&con);
+  return 11;
+ }
 
- close(in);
+ if ( roar_stream_exec(&con, &s) == -1 ) {
+  fprintf(stderr, "Error: can not exec stream\n");
+  roar_disconnect(&con);
+  return 12;
+ }
+
+ if ( roar_get_connection_vio(&con, &stream) == -1 ) {
+  fprintf(stderr, "Error: can not get stream vio\n");
+  roar_disconnect(&con);
+  return 13;
+ }
+
+ roar_vio_copy_data(&stream, &file);
+
+ roar_vio_close(&stream);
+ roar_vio_close(&file);
 
  return 0;