Changeset 571:0dfe525abe11 in roaraudio

Timestamp:

08/19/08 02:25:49 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed bugs then codec filter can not be opened: delete stream

Location:

roard

Files:

• codecfilter.c (modified) (1 diff)
• streams.c (modified) (1 diff)

roard/codecfilter.c

@@ -80 +80 @@
 
  if (*codecfilter_id != -1) {
-  if ( filter->open )
-   return filter->open(inst, codec, info, filter);
+  if ( filter->open ) {
+   if ( (i = filter->open(inst, codec, info, filter)) == -1 ) {
+    info->codecfilter = *codecfilter_id = -1;
+   }
+   return i;
+  }
   return 0;
  }
 
- return -1;
+ return 0; // we found no filter -> ok
 }
 

roard/streams.c

@@ -136 +136 @@
  ((struct roar_stream *)g_streams[id])->fh = fh;
 
- codecfilter_open(&(g_streams[id]->codecfilter_inst), &(g_streams[id]->codecfilter), NULL,
-                  ROAR_STREAM(g_streams[id])->info.codec, g_streams[id]);
+ if ( codecfilter_open(&(g_streams[id]->codecfilter_inst), &(g_streams[id]->codecfilter), NULL,
+                  ROAR_STREAM(g_streams[id])->info.codec, g_streams[id]) == -1 ) {
+  return streams_delete(id);
+ }
 
  dir = ROAR_STREAM(g_streams[id])->dir;