Changeset 542:c71495eebd20 in roaraudio

Timestamp:

08/18/08 15:54:45 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added sources_add_cf()

Location:

roard

Files:

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

roard/include/sources.h

@@ -17 +17 @@
 int sources_add_raw  (char * driver, char * device, char * container, char * options, int primary);
 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);
 
 #endif

roard/sources.c

@@ -26 +26 @@
  } else if ( strcmp(driver, "wav") == 0 ) {
   return sources_add_wav(driver, device, container, options, primary);
+ } else if ( strcmp(driver, "cf") == 0 ) {
+  return sources_add_cf(driver, device, container, options, primary);
  }
 
@@ -96 +98 @@
  return 0;
 }
+
+int sources_add_cf (char * driver, char * device, char * container, char * options, int primary) {
+ int stream;
+ int fh;
+ int codec;
+ struct roar_stream * s;
+
+ if ( (codec = roar_str2codec(options)) == -1 )
+  return -1;
+
+ if ( (fh = open(device, O_RDONLY, 0644)) == -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;
+
+ streams_set_fh(stream, fh);
+
+ client_stream_add(g_source_client, stream);
+
+ return 0;
+}
+
 //ll