Changeset 2252:8860b2075ca5 in roaraudio for roard/streams.c

Timestamp:

07/28/09 20:38:20 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved THRU stream support from individual stream types to the general read() for streams, let's see if it works.

File:

• roard/streams.c (modified) (4 diffs)

roard/streams.c

@@ -1134 +1134 @@
 int streams_check  (int id) {
  int fh;
- int i;
  ssize_t req, realreq, done;
  struct roar_stream        *   s;
@@ -1216 +1215 @@
 
   roar_buffer_get_data(b, (void **)&buf);
-  for (i = 0; i < ROAR_STREAMS_MAX; i++) {
-   if ( g_streams[i] != NULL && ROAR_STREAM(g_streams[i])->pos_rel_id == id ) {
-    if ( ROAR_STREAM(g_streams[i])->dir == ROAR_DIR_THRU ) {
-     if ( stream_vio_write(i, buf, req) != req ) {
-      streams_delete(i);
-     }
-    }
-   }
-  }
  } else {
   req = codecfilter_read(ss->codecfilter_inst, ss->codecfilter, buf, req);
@@ -1494 +1484 @@
   size_t len =  0;
  ssize_t r   = -1;
+ int     i;
 
  errno = 0;
@@ -1516 +1507 @@
   return -1;
 
+ for (i = 0; i < ROAR_STREAMS_MAX; i++) {
+  if ( g_streams[i] != NULL && ROAR_STREAM(g_streams[i])->pos_rel_id == ROAR_STREAM(stream)->id ) {
+   if ( ROAR_STREAM(g_streams[i])->dir == ROAR_DIR_THRU ) {
+    if ( stream_vio_write(i, buf, len) != len ) {
+     streams_delete(i);
+    }
+   }
+  }
+ }
+
  return len;
 }