Changeset 5022:b2a2e896974d in roaraudio for roarclients/roarcatvio.c

Timestamp:

05/27/11 17:13:54 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Converted most roarclients to to use VS API (See: #87)

File:

• roarclients/roarcatvio.c (modified) (3 diffs)

roarclients/roarcatvio.c

@@ -44 +44 @@
 
 int main (int argc, char * argv[]) {
- int    rate     = ROAR_RATE_DEFAULT;
- int    bits     = ROAR_BITS_DEFAULT;
- int    channels = ROAR_CHANNELS_DEFAULT;
+ struct roar_audio_info info = {.rate = ROAR_RATE_DEFAULT, .bits = ROAR_BITS_DEFAULT, .channels = ROAR_CHANNELS_DEFAULT};
  int    codec    = -1;
+ int    auinfo_changed = 0;
  char * server   = NULL;
  char * k;
  int    i;
  char * name = "roarcatvio";
- struct roar_vio_calls file, stream;
- struct roar_vio_defaults def;
- int file_opened = 0;
- const char * content_type;
-
- if ( roar_vio_open_fh(&file, ROAR_STDIN) == -1 )
-  return 1;
-
- if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 )
-  return 1;
+ roar_vs_t * vss;
+ char * filename = NULL;
+ int err;
 
  for (i = 1; i < argc; i++) {
@@ -71 +63 @@
    name = argv[++i];
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") ) {
-   rate = atoi(argv[++i]);
+   info.rate = roar_str2rate(argv[++i]);
+   auinfo_changed = 1;
   } else if ( !strcmp(k, "--bits") ) {
-   bits = atoi(argv[++i]);
+   info.bits = roar_str2bits(argv[++i]);
+   auinfo_changed = 1;
   } else if ( !strcmp(k, "-b") ) {
-   bits = 8;
+   info.bits = 8;
+   auinfo_changed = 1;
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") ) {
-   channels = atoi(argv[++i]);
+   info.channels = roar_str2channels(argv[++i]);
+   auinfo_changed = 1;
   } else if ( !strcmp(k, "-m") ) {
-   channels = 1;
+   info.channels = 1;
+   auinfo_changed = 1;
   } else if ( !strcmp(k, "--codec") ) {
    codec = roar_str2codec(argv[++i]);
+   auinfo_changed = 1;
   } else if ( !strcmp(k, "--help") ) {
    usage();
    return 0;
-  } 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;
-   }
-
-   if ( codec == -1 ) {
-    if ( roar_vio_ctl(&file, ROAR_VIO_CTL_GET_MIMETYPE, &content_type) != -1 ) {
-     codec = roar_mime2codec(content_type);
-    }
-   }
+  } else if ( filename == NULL ) {
+   filename    = k;
   } else {
    fprintf(stderr, "Error: unknown argument: %s\n", k);
@@ -107 +95 @@
   codec = ROAR_CODEC_DEFAULT;
 
- if ( roar_vio_simple_stream(&stream, rate, channels, bits, codec, server, ROAR_DIR_PLAY, name) == -1 ) {
-  fprintf(stderr, "Error: can not start playback\n");
-  return 1;
+ info.codec = codec;
+
+ if ( (vss = roar_vs_new(server, name, &err)) == NULL ) {
+  fprintf(stderr, "Error: can not connect to server: %s: %s\n",
+   server == NULL ? "(default)" : server, roar_error2str(err));
+  return 10;
  }
 
- roar_vio_copy_data(&stream, &file);
+ if ( auinfo_changed ) {
+  if ( roar_vs_stream(vss, &info, ROAR_DIR_PLAY, &err) == -1 ) {
+   fprintf(stderr, "Error: can not create new stream: %s\n", roar_error2str(err));
+   roar_vs_close(vss, ROAR_VS_TRUE, NULL);
+   return 10;
+  }
+ }
 
- roar_vio_close(&file);
- roar_vio_close(&stream);
+ if ( roar_vs_file_simple(vss, filename, &err) == -1 ) {
+  fprintf(stderr, "Error: can not open file: %s: %s\n", filename, roar_error2str(err));
+  roar_vs_close(vss, ROAR_VS_TRUE, NULL);
+  return 10;
+ }
+
+ roar_vs_run(vss, NULL);
+
+ roar_vs_sync(vss, ROAR_VS_WAIT, NULL);
+ roar_vs_close(vss, ROAR_VS_FALSE, NULL);
 
  return 0;