Changeset 5533:42f48072307c in roaraudio for roarclients/roarinterconnect.c

Timestamp:

06/12/12 14:39:40 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed usage of -R/-B/-C/-E as well as --aiprofile in roarclients (Closes: #176)

File:

• roarclients/roarinterconnect.c (modified) (13 diffs)

roarclients/roarinterconnect.c

@@ -76 +76 @@
  printf("\nOptions:\n\n");
 
- printf("  --server SERVER    - Set server hostname\n"
-        "  --remote SERVER    - Set remote server\n"
-        "  --type   TYPE      - Set type of remote server\n"
-        "  --rate   RATE      - Set sample rate\n"
-        "  --bits   BITS      - Set bits per sample\n"
-        "  --chans  CHANNELS  - Set number of channels\n"
-        "  --codec  CODEC     - Set the codec\n"
-        "  --help             - Show this help\n"
-        "  --verbose -v       - Be verbose\n"
+ printf("  --server SERVER     - Set server hostname\n"
+        "  --remote SERVER     - Set remote server\n"
+        "  --type   TYPE       - Set type of remote server\n"
+        "  --rate  -R RATE     - Set sample rate\n"
+        "  --bits  -B BITS     - Set bits per sample\n"
+        "  --chans -C CHANNELS - Set number of channels\n"
+        "  --codec -E CODEC    - Set the codec\n"
+        "  --aiprofile PROFILE - Set audio profile\n"
+        "  --help              - Show this help\n"
+        "  --verbose -v        - Be verbose\n"
        );
 
  printf("\nPossible Types:\n\n");
- printf("  roar               - RoarAudio Server\n"
+ printf("  roar                - RoarAudio Server\n"
 #ifdef ROAR_HAVE_ESD
-        "  esd                - EsounD Server\n"
-#endif
-        "  simple             - PulseAudio using simple protocol\n"
+        "  esd                 - EsounD Server\n"
+#endif
+        "  simple              - PulseAudio using simple protocol\n"
 #ifdef _HAVE_OSS
-        "  oss                - Open Sound System (OSS) device\n"
+        "  oss                 - Open Sound System (OSS) device\n"
 #endif
 #ifdef _HAVE_RSOUND
-        "  rsound             - RSound server\n"
+        "  rsound              - RSound server\n"
 #endif
         "\n"
-        "  bidir              - Connect bidirectional\n"
-        "  filter             - Use local server as filter for remote server\n"
-        "  transmit           - Transmit data from local server to remote server\n"
-        "  receive            - Receive data from remote server\n"
-        "  recplay            - Record from and play data to remote server\n"
-        "  record             - Record data from remote server\n"
+        "  bidir               - Connect bidirectional\n"
+        "  filter              - Use local server as filter for remote server\n"
+        "  transmit            - Transmit data from local server to remote server\n"
+        "  receive             - Receive data from remote server\n"
+        "  recplay             - Record from and play data to remote server\n"
+        "  record              - Record data from remote server\n"
        );
 
@@ -257 +258 @@
  struct roar_stream     stream[1];
  struct roar_vio_calls  vio;
-#ifdef _HAVE_OSS
  struct roar_audio_info info;
-#endif
 #ifdef _HAVE_RSOUND
  rsound_t *rd;
  enum rsd_format fmt = 0;
 #endif
- int    rate     = 44100;
- int    bits     = 16;
- int    channels = 2;
- int    codec    = ROAR_CODEC_DEFAULT;
  int    type     = parse_type(NULL);
  int    tmp;
@@ -278 +273 @@
  int    rport;
 
+ if ( roar_profile2info(&info, "default") == -1 )
+  return 1;
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -287 +285 @@
   } else if ( strcmp(k, "--type") == 0 ) {
    type = parse_type(argv[++i]);
-  } else if ( strcmp(k, "--rate") == 0 ) {
-   rate = roar_str2rate(argv[++i]);
-  } else if ( strcmp(k, "--bits") == 0 ) {
-   bits = roar_str2bits(argv[++i]);
-  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 ) {
-   channels = roar_str2channels(argv[++i]);
-  } else if ( strcmp(k, "--codec") == 0 ) {
-   codec = roar_str2codec(argv[++i]);
+  } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 ) {
+   info.rate = roar_str2rate(argv[++i]);
+  } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) {
+   info.bits = roar_str2bits(argv[++i]);
+  } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) {
+   info.channels = roar_str2channels(argv[++i]);
+  } else if ( strcmp(k, "--codec") == 0 || strcmp(k, "-E") == 0 ) {
+   info.codec = roar_str2codec(argv[++i]);
+  } else if ( !strcmp(k, "--aiprofile") ) {
+   if ( roar_profile2info(&info, argv[++i]) == -1 ) {
+    fprintf(stderr, "Error: Can not load audio profile: %s: %s\n", argv[i], roar_error2str(roar_error));
+    return 1;
+   }
   } else if ( strcmp(k, "--verbose") == 0 || strcmp(k, "-v") == 0 ) {
    g_verbose++;
@@ -339 +342 @@
        return 2;
     }
-    if ( roar_vio_simple_stream(&vio, rate, channels, bits, codec, remote, tmp, CLIENT_NAME, -1) == -1 ) {
+    if ( roar_vio_simple_stream(&vio,
+                                info.rate, info.channels, info.bits, info.codec,
+                                remote, tmp, CLIENT_NAME, -1) == -1 ) {
      fprintf(stderr, "Error: can not open RoarAudio stream to %s: %s\n", remote, roar_error2str(roar_error));
      return 2;
@@ -374 +379 @@
        return 2;
     }
-    info.rate     = rate;
-    info.channels = channels;
-    info.bits     = bits;
-    info.codec    = codec;
     if ( roar_cdriver_oss(&vio, "OSS", remote, &info, tmp) == -1 ) {
      fprintf(stderr, "Error: can not open OSS device %s: %s\n", remote, roar_error2str(roar_error));
@@ -393 +394 @@
     tmp = ESD_STREAM|ESD_PLAY;
 
-    switch (bits) {
+    switch (info.bits) {
      case  8: tmp |= ESD_BITS8;  break;
      case 16: tmp |= ESD_BITS16; break;
@@ -401 +402 @@
     }
 
-    switch (channels) {
+    switch (info.channels) {
      case 1: tmp |= ESD_MONO;   break;
      case 2: tmp |= ESD_STEREO; break;
@@ -410 +411 @@
 
     // TODO: FIXME: this is only true if the esd runs on a LE system,...
-    if ( bits == 8 && codec != ROAR_CODEC_PCM_U_LE ) {
+    if ( info.bits == 8 && info.codec != ROAR_CODEC_PCM_U_LE ) {
      fprintf(stderr, "Error: EsounD only supports unsigned PCM in 8 bit mode\n");
      return 2;
-    } else if ( bits == 16 && codec != ROAR_CODEC_DEFAULT ) {
+    } else if ( info.bits == 16 && info.codec != ROAR_CODEC_DEFAULT ) {
      fprintf(stderr, "Error: EsounD only supports signed PCM in 16 bit mode\n");
      return 2;
@@ -420 +421 @@
     switch (type & ST_MASK) {
      case ST_FILTER:
-       rfh = esd_filter_stream(tmp, rate, remote, CLIENT_NAME);
+       rfh = esd_filter_stream(tmp, info.rate, remote, CLIENT_NAME);
       break;
      case ST_TRANSMIT:
-       rfh = esd_play_stream(tmp, rate, remote, CLIENT_NAME);
+       rfh = esd_play_stream(tmp, info.rate, remote, CLIENT_NAME);
        localdir = ROAR_DIR_MONITOR;
       break;
      case ST_RECEIVE:
-       rfh = esd_monitor_stream(tmp, rate, remote, CLIENT_NAME);
+       rfh = esd_monitor_stream(tmp, info.rate, remote, CLIENT_NAME);
        localdir = ROAR_DIR_PLAY;
       break;
@@ -439 +440 @@
 #ifdef _HAVE_RSOUND
   case MT_RSOUND:
-    fmt = para2rsdfmt(bits, codec);
+    fmt = para2rsdfmt(info.bits, info.codec);
 
     if ( fmt == 0 ) {
@@ -452 +453 @@
        rsd_init(&rd);
        rsd_set_param(rd, RSD_HOST,       remote);
-       rsd_set_param(rd, RSD_CHANNELS,   &channels);
-       rsd_set_param(rd, RSD_SAMPLERATE, &rate);
+       tmp = info.channels;
+       rsd_set_param(rd, RSD_CHANNELS,   &tmp);
+       tmp = info.rate;
+       rsd_set_param(rd, RSD_SAMPLERATE, &tmp);
        rsd_set_param(rd, RSD_FORMAT,     &fmt);
 #ifdef RSD_IDENTITY
@@ -526 +529 @@
  }
 
- if ( roar_stream_new(stream, rate, channels, bits, codec) == -1 ) {
+ if ( roar_stream_new(stream, info.rate, info.channels, info.bits, info.codec) == -1 ) {
   roar_disconnect(con);
   return 21;