Changeset 1022:fe708cd3a6a6 in roaraudio

Timestamp:

12/21/08 14:31:39 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar source driver

Location:

roard

Files:

• include/sources.h (modified) (1 diff)
• sources.c (modified) (2 diffs)

roard/include/sources.h

@@ -40 +40 @@
 int sources_add_wav  (char * driver, char * device, char * container, char * options, int primary);
 int sources_add_cf   (char * driver, char * device, char * container, char * options, int primary);
+int sources_add_roar (char * driver, char * device, char * container, char * options, int primary);
 
 #endif

roard/sources.c

@@ -50 +50 @@
  } else if ( strcmp(driver, "cf") == 0 ) {
   return sources_add_cf(driver, device, container, options, primary);
+ } else if ( strcmp(driver, "roar") == 0 ) {
+  return sources_add_roar(driver, device, container, options, primary);
  }
 
@@ -186 +188 @@
 }
 
+int sources_add_roar (char * driver, char * device, char * container, char * options, int primary) {
+ int  stream;
+ int  fh;
+ int  codec = ROAR_CODEC_DEFAULT;
+ struct roar_stream * s;
+
+ if ( options != NULL && *options ) {
+  if ( (codec = roar_str2codec(options)) == -1 ) {
+   return -1;
+  }
+ }
+
+ if ( (fh = roar_simple_monitor(g_sa->rate, g_sa->channels, g_sa->bits, codec, device, "roard")) == -1 ) {
+  return -1;
+ }
+
+ if ( (stream = streams_new()) == -1 ) {
+  close(fh);
+  return -1;
+ }
+
+ streams_get(stream, (struct roar_stream_server **)&s);
+
+ memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info));
+
+ s->dir        = ROAR_DIR_PLAY;
+ s->pos_rel_id = -1;
+ s->info.codec = codec;
+
+ ROAR_STREAM_SERVER(s)->codec_orgi = codec;
+
+ streams_set_fh(stream, fh);
+
+ if ( primary )
+  streams_mark_primary(stream);
+
+ client_stream_add(g_source_client, stream);
+
+ return 0;
+}
+
 //ll