Changeset 1913:b4b824af799b in roaraudio

Timestamp:

05/26/09 23:06:36 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added stream attribute 'ready'

Location:

roard

Files:

• include/streams.h (modified) (1 diff)
• streams.c (modified) (6 diffs)

roard/include/streams.h

@@ -73 +73 @@
  uint_least32_t delay;
  char * name;
+ int ready;
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/streams.c

@@ -94 +94 @@
    s->codec_orgi      = -1;
    s->primary         =  0;
+   s->ready           =  0;
 
    s->mixer.scale     = 65535;
@@ -255 +256 @@
 int streams_set_fh     (int id, int fh) {
  struct roar_stream_server * ss;
+ struct roar_stream        * s;
  int dir;
 
- if ( (ss = g_streams[id]) == NULL )
-  return -1;
-
- ROAR_DBG("streams_set_fh(id=%i): g_streams[id]->id=%i", id, ROAR_STREAM(ss)->id);
-
- ROAR_STREAM(g_streams[id])->fh = fh;
+ if ( (s = ROAR_STREAM(ss = g_streams[id])) == NULL )
+  return -1;
+
+ ROAR_DBG("streams_set_fh(id=%i): g_streams[id]->id=%i", id, s->id);
+
+ s->fh = fh;
 
  ROAR_DBG("streams_set_fh(id=%i, fh=%i): driverID=%i", id, fh, ss->driver_id);
@@ -270 +272 @@
 
  if ( codecfilter_open(&(ss->codecfilter_inst), &(ss->codecfilter), NULL,
-                  ROAR_STREAM(ss)->info.codec, ss) == -1 ) {
-  return streams_delete(id);
+                  s->info.codec, ss) == -1 ) {
+  return streams_delete(id); // TODO: FIXME: is this correct? shoudn't we return -1 in any case here?
  }
 
@@ -283 +285 @@
     fh = -2;
    } else {
-    ROAR_STREAM(g_streams[id])->fh = fh;
+    s->fh = fh;
    }
   }
@@ -289 +291 @@
 
  if ( fh == -1 || fh == -2 ) { // yes, this is valid, indecats full vio!
+  ss->ready = 1;
   return 0;
  }
@@ -307 +310 @@
 
  if ( dir == ROAR_DIR_FILTER ) {
+  ss->ready = 1;
   return 0;
  } else {
-  return roar_socket_nonblock(fh, ROAR_SOCKET_NONBLOCK);
+  if ( roar_socket_nonblock(fh, ROAR_SOCKET_NONBLOCK) == -1 )
+   return -1;
+
+  ss->ready = 1;
+  return 0;
  }
 }