Changeset 65:65d45c7144e1 in roaraudio

Timestamp:

07/12/08 13:11:05 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done some coding to support sources

Location:

roard

Files:

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

roard/include/sources.h

@@ -13 +13 @@
 int sources_set_client (int client);
 
-int sources_add (char * driver, char * device, char * containe, char * options, int primary);
+int sources_add (char * driver, char * device, char * container, char * options, int primary);
+
+int sources_add_raw (char * driver, char * device, char * container, char * options, int primary);
 
 #endif

roard/sources.c

@@ -21 +21 @@
 }
 
-int sources_add (char * driver, char * device, char * containe, char * options, int primary) {
+int sources_add (char * driver, char * device, char * container, char * options, int primary) {
+ if ( strcmp(driver, "raw") == 0 )
+  return sources_add_raw(driver, device, container, options, primary);
+
  return -1;
 }
 
+int sources_add_raw (char * driver, char * device, char * container, char * options, int primary) {
+ int stream;
+ int fh;
+ struct roar_stream * s;
+
+ 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;
+
+ streams_set_fh(stream, fh);
+
+ client_stream_add(g_source_client, stream);
+
+ return 0;
+}
+
 //ll