Changeset 4544:d8158852ff37 in roaraudio

Timestamp:

10/24/10 15:55:19 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed missing reset on delete of flag ROAR_FLAG_SINGLESINK, fixed pre-thru stream stuff.

File:

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

roard/streams.c

@@ -190 +190 @@
  roar_notify_core_emit_snoargs(ROAR_OE_BASICS_DELETE, -1, id, ROAR_OT_STREAM);
 
+ if ( s->flags & ROAR_FLAG_SINGLESINK )
+  streams_set_single_sink(id, 1);
+
  counters_inc(streams, -1);
 
@@ -796 +799 @@
   *        If the flag is unset on the mixer but got set by the sources the counter
   *        may/will become corrupted.
-  *
-  * TODO:  If a stream is deleted and this flag is set this rutine must be called to
-  *        maintain a correct count.
   */
 
@@ -841 +841 @@
   if ( (s = ROAR_STREAM((ss = g_streams[i]))) != NULL ) {
    if ( s->dir == ROAR_DIR_THRU )
-    if ( s->pos_rel_id == id || s->pos_rel_id == mixer )
+    if ( s->pos_rel_id == id || s->pos_rel_id == mixer || g_streams[s->pos_rel_id]->mixer_stream == mixer )
      return -1;
 
@@ -849 +849 @@
    ssdir = streams_get_ssdir(i);
 
-   if ( ssdir & STREAM_DIR_OUT ) {
+   if ( ssdir & STREAM_DIR_OUT )
     count++;
-    if ( streams_thru_num ) {
-     return -1;
-    }
-   }
   }
  }