Changeset 3215:13678c1774be in roaraudio

Timestamp:

01/24/10 06:03:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

reset mixer stream in case a mixer comes up

Location:

roard

Files:

• light.c (modified) (2 diffs)
• midi.c (modified) (2 diffs)
• waveform.c (modified) (2 diffs)

roard/light.c

@@ -29 +29 @@
 int light_init  (unsigned int channels) {
  struct roar_stream_server * ss;
+ int i;
 
  g_light_state.channels = 0;
@@ -54 +55 @@
  ROAR_STREAM(ss)->info.bits  = ROAR_LIGHT_BITS;
  ROAR_STREAM(ss)->info.rate  = ROAR_OUTPUT_CFREQ;
+
+ for (i = 0; i < ROAR_STREAMS_MAX; i++) {
+  if ( g_streams[i] != NULL ) {
+   if ( streams_get_subsys(i) == ROAR_SUBSYS_LIGHT ) {
+    streams_set_mixer_stream(i, g_light_mixer.stream);
+   }
+  }
+ }
 
  return light_reset();

roard/midi.c

@@ -45 +45 @@
 int midi_init (void) {
  struct roar_stream_server * ss;
+ int i;
 
  midi_config.inited = 0;
@@ -69 +70 @@
  }
  ss->state = ROAR_STREAMSTATE_OLD;
+
+ for (i = 0; i < ROAR_STREAMS_MAX; i++) {
+  if ( g_streams[i] != NULL ) {
+   if ( streams_get_subsys(i) == ROAR_SUBSYS_MIDI ) {
+    streams_set_mixer_stream(i, g_midi_mixer.stream);
+   }
+  }
+ }
 
  midi_config.inited |= MIDI_INITED_MAIN;

roard/waveform.c

@@ -28 +28 @@
  struct roar_stream_server * ss;
  struct roar_stream        *  s;
+ int                          i;
 
  if ( (g_waveform_mixer.stream = add_mixer(ROAR_SUBSYS_WAVEFORM, _MIXER_NAME("Waveform"), &ss)) == -1 )
@@ -39 +40 @@
 
  ss->state = ROAR_STREAMSTATE_OLD;
+
+ for (i = 0; i < ROAR_STREAMS_MAX; i++) {
+  if ( g_streams[i] != NULL ) {
+   if ( streams_get_subsys(i) == ROAR_SUBSYS_WAVEFORM ) {
+    streams_set_mixer_stream(i, g_waveform_mixer.stream);
+   }
+  }
+ }
 
  return 0;