Changeset 3136:e9b53172083c in roaraudio

Timestamp:

01/15/10 10:40:14 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for config option force-{rate,bits,codec,channels}

Files:

• include/libroar/config.h (modified) (1 diff)
• libroar/config.c (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)

include/libroar/config.h

@@ -91 +91 @@
   struct roar_libroar_config_codec * codec;
  } codecs;
+ struct roar_audio_info info;
 };
 

libroar/config.c

@@ -218 +218 @@
     ROAR_WARN("roar_libroar_config_parse(*): Unknown warning option: %s", v);
    }
+  } else if ( !strcmp(k, "force-rate") ) {
+   config->info.rate = atoi(v);
+  } else if ( !strcmp(k, "force-bits") ) {
+   config->info.bits = atoi(v);
+  } else if ( !strcmp(k, "force-channels") ) {
+   config->info.channels = atoi(v);
+  } else if ( !strcmp(k, "force-codec") ) {
+   config->info.codec = roar_str2codec(v);
   } else if ( !strcmp(k, "codec") ) {
    if ( roar_libroar_config_parse_codec(config, v) == -1 ) {

libroar/stream.c

@@ -36 +36 @@
 
 int roar_stream_connect (struct roar_connection * con, struct roar_stream * s, int dir) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
+ struct roar_stream  ms;
  struct roar_message m;
 
  s->dir = dir;
+
+ memcpy(&ms, s, sizeof(ms));
 
  m.cmd     = ROAR_CMD_NEW_STREAM;
@@ -44 +48 @@
  m.pos     = 0;
 
- roar_stream_s2m(s, &m);
+ if ( config != NULL ) {
+  if ( config->info.rate )
+   ms.info.rate = config->info.rate;
+  if ( config->info.bits )
+   ms.info.bits = config->info.bits;
+  if ( config->info.channels )
+   ms.info.channels = config->info.channels;
+  if ( config->info.codec )
+   ms.info.codec = config->info.codec;
+ }
+
+ roar_stream_s2m(&ms, &m);
 
  if ( roar_req(con, &m, NULL) != 0 )