Changeset 2609:be3a02306b24 in roaraudio

Timestamp:

09/11/09 15:32:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

more debug lions, delete parent streams only in case there is one set

File:

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

roard/streams.c

@@ -135 +135 @@
  int no_vio_close = 0;
  int i;
+ int client;
 
  if ( (s = g_streams[id]) == NULL )
@@ -155 +156 @@
     default:
       if ( streams_get_flag(i, ROAR_FLAG_VIRTUAL) == 1 ) {
-       if ( i != id )
+       if ( i != id ) {
+        ROAR_DBG("streams_delete(id=%i): Deleting virtual child stream %i", id, i);
         streams_delete(i);
+       }
       } else {
        ROAR_STREAM(g_streams[i])->pos_rel_id = -1;
@@ -169 +172 @@
  if ( streams_get_flag(id, ROAR_FLAG_VIRTUAL) == 1 ) {
   // we un-group the stream here to avoid a client deleting the parent deleting the client deleting ...
-  i = ROAR_STREAM(s)->pos_rel_id;
-  ROAR_STREAM(s)->pos_rel_id = -1;
-  ROAR_DBG("streams_delete(id=%i): Stream has flag virtual, notifying parent stream %i", id, i);
-  streams_ctl(i, ROAR_CODECFILTER_CTL_VIRTUAL_DELETE, &id);
-  ROAR_STREAM(s)->pos_rel_id = i;
+  i      = ROAR_STREAM(s)->pos_rel_id;
+  if ( i != -1 ) {
+   ROAR_STREAM(s)->pos_rel_id = -1;
+   client = streams_get_client(id);
+   streams_set_client(id, -1);
+   ROAR_DBG("streams_delete(id=%i): Stream has flag virtual, notifying parent stream %i", id, i);
+   streams_ctl(i, ROAR_CODECFILTER_CTL_VIRTUAL_DELETE, &id);
+   ROAR_DBG("streams_delete(id=%i): Notify send to stream %i", id, i);
+   streams_set_client(id, client);
+   ROAR_STREAM(s)->pos_rel_id = i;
+  }
  }