Changeset 67:9c8c096465ad in roaraudio

Timestamp:

07/12/08 13:49:47 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added basic most-time-it-should-work RIFF/WAVE support to sources.c

Location:

roard

Files:

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

roard/include/sources.h

@@ -15 +15 @@
 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);
+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);
 
 #endif

roard/sources.c

@@ -22 +22 @@
 
 int sources_add (char * driver, char * device, char * container, char * options, int primary) {
- if ( strcmp(driver, "raw") == 0 )
+ if ( strcmp(driver, "raw") == 0 ) {
   return sources_add_raw(driver, device, container, options, primary);
+ } else if ( strcmp(driver, "wav") == 0 ) {
+  return sources_add_wav(driver, device, container, options, primary);
+ }
 
  return -1;
@@ -56 +59 @@
 }
 
+int sources_add_wav (char * driver, char * device, char * container, char * options, int primary) {
+ int stream;
+ int fh;
+ char buf[44];
+ struct roar_stream * s;
+
+ if ( (fh = open(device, O_RDONLY, 0644)) == -1 ) {
+  return -1;
+ }
+
+ if (read(fh, buf, 44) != 44) {
+  close(fh);
+  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));
+
+  memcpy(&(s->info.rate    ), buf+24, 4);
+  memcpy(&(s->info.channels), buf+22, 2);
+  memcpy(&(s->info.bits    ), buf+34, 2);
+
+ 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