Changeset 4545:47a468d8b448 in roaraudio for roard/streams.c

Timestamp:

10/24/10 21:11:48 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed unflag singlesink on mixer bug

File:

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

roard/streams.c

@@ -371 +371 @@
   }
 
-  if ( (mixer = streams_get_mixer_stream(id)) != -1 ) {
-   if ( g_streams[mixer]->flags & ROAR_FLAG_SINGLESINK ) {
-    streams_set_mixer_stream(id, -1);
-    return -1;
+  if ( streams_get_ssdir(id) & STREAM_DIR_OUT ) {
+   if ( (mixer = streams_get_mixer_stream(id)) != -1 ) {
+    if ( g_streams[mixer]->flags & ROAR_FLAG_SINGLESINK ) {
+     streams_set_mixer_stream(id, -1);
+     return -1;
+    }
    }
   }
@@ -807 +809 @@
  mixer = self_ss->mixer_stream;
 
+ ROAR_WARN("streams_set_single_sink(id=%i, reset=%i): mixer=%i", id, reset, mixer);
+
  if ( id == mixer ) {
   if ( reset ) {
-   if ( self_ss->single_sink_c > 1 ) {
+   if ( self_ss->single_sink_self_c ) {
+    ROAR_WARN("streams_set_single_sink(id=%i, reset=%i): mixer=%i", id, reset, mixer);
+    self_ss->single_sink_self_c--;
     self_ss->single_sink_c--;
-    self_ss->flags |= ROAR_FLAG_SINGLESINK;
-    self_ss->flags -= ROAR_FLAG_SINGLESINK;
+    if ( self_ss->single_sink_c == 0 ) {
+     ROAR_WARN("streams_set_single_sink(id=%i, reset=%i): mixer=%i", id, reset, mixer);
+     self_ss->flags |= ROAR_FLAG_SINGLESINK;
+     self_ss->flags -= ROAR_FLAG_SINGLESINK;
+    }
     return 0;
+   } else {
+    return -1;
    }
   } else {
    if ( self_ss->single_sink_c ) {
+    self_ss->single_sink_self_c++;
     self_ss->single_sink_c++;
     return 0;
@@ -822 +834 @@
   }
  } else if ( reset ) {
+  ROAR_WARN("streams_set_single_sink(id=%i, reset=%i): mixer=%i", id, reset, mixer);
+
   if ( (ss = g_streams[mixer])->single_sink_c == 0 )
    return -1;
@@ -859 +873 @@
  ss = g_streams[mixer];
 
+ if ( id == mixer )
+  ss->single_sink_self_c++;
+
  ss->single_sink_c++;
 
@@ -889 +906 @@
  if ( flag & ROAR_FLAG_SINGLESINK ) {
   if ( streams_set_single_sink(id, 0) == -1 ) {
-   flag -= ROAR_FLAG_SINGLESINK;
-   return -1;
-  }
+   return -1;
+  }
+  flag -= ROAR_FLAG_SINGLESINK;
  }
 
@@ -986 +1003 @@
  if ( flag & ROAR_FLAG_SINGLESINK ) {
   if ( streams_set_single_sink(id, 1) == -1 ) {
-   flag -= ROAR_FLAG_SINGLESINK;
-   return -1;
-  }
+   return -1;
+  }
+  flag -= ROAR_FLAG_SINGLESINK;
  }