Changeset 1243:741d7d9f165a in roaraudio

Timestamp:

02/26/09 14:06:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use vio close for normal streams (non-driver)

Location:

roard

Files:

• driver.c (modified) (3 diffs)
• streams.c (modified) (3 diffs)

roard/driver.c

@@ -106 +106 @@
   driver = ROAR_DRIVER_DEFAULT;
 
+ ROAR_DBG("driver_openvio(*): searching for driver '%s'...", driver);
+
  for (i = 0; g_driver[i].name != NULL; i++) {
   if ( strcmp(g_driver[i].name, driver) == 0 ) {
@@ -111 +113 @@
 
    *driver_id = i;
+
+   ROAR_DBG("driver_openvio(*): driver found: %s -> %i", driver, i);
 
    if ( g_driver[i].vio_init == NULL ) {
@@ -126 +130 @@
    }
 
+   ROAR_DBG("driver_openvio(*): Opening VIO driver %s(%i)...", driver, i);
    return g_driver[i].vio_init(calls, device, info, fh);
   }

roard/streams.c

@@ -156 +156 @@
   free(s->output);
 
+/*
  if ( ROAR_STREAM(s)->fh != -1 )
   close(ROAR_STREAM(s)->fh);
+*/
+
+ roar_vio_close(&(s->vio));
 
  prim = s->primary;
@@ -193 +197 @@
 
 int streams_set_fh     (int id, int fh) {
+ struct roar_stream_server * ss;
  int dir;
 
- if ( g_streams[id] == NULL )
-  return -1;
-
- ROAR_DBG("streams_set_fh(id=%i): g_streams[id]->id=%i", id, ROAR_STREAM(g_streams[id])->id);
+ 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 ( codecfilter_open(&(g_streams[id]->codecfilter_inst), &(g_streams[id]->codecfilter), NULL,
-                  ROAR_STREAM(g_streams[id])->info.codec, g_streams[id]) == -1 ) {
+ ROAR_DBG("streams_set_fh(id=%i, fh=%i): driverID=%i", id, fh, ss->driver_id);
+
+ if ( ss->driver_id == -1 )
+  roar_vio_set_fh(&(ss->vio), fh);
+
+ if ( codecfilter_open(&(ss->codecfilter_inst), &(ss->codecfilter), NULL,
+                  ROAR_STREAM(ss)->info.codec, ss) == -1 ) {
   return streams_delete(id);
  }
@@ -213 +223 @@
 // roar_socket_recvbuf(fh, ROAR_OUTPUT_CALC_OUTBUFSIZE( &(ROAR_STREAM(g_streams[id])->info) )); // set recv buffer to minimum
 
- dir = ROAR_STREAM(g_streams[id])->dir;
+ dir = ROAR_STREAM(ss)->dir;
 
  if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD || dir == ROAR_DIR_OUTPUT ) {