Changeset 2943:da369368665c in roaraudio

Timestamp:

10/16/09 23:05:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected stream states

File:

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

roard/midi.c

@@ -44 +44 @@
 
 int midi_init (void) {
+ struct roar_stream_server * ss;
 
  midi_config.inited = 0;
@@ -64 +65 @@
  g_midi_mess.buf = NULL;
 
- if ( (g_midi_mixer.stream = add_mixer(ROAR_SUBSYS_MIDI, _MIXER_NAME("MIDI"), NULL)) == -1 ) {
+ if ( (g_midi_mixer.stream = add_mixer(ROAR_SUBSYS_MIDI, _MIXER_NAME("MIDI"), &ss)) == -1 ) {
   ROAR_WARN("Can not create MIDI mixer");
  }
+ ss->state = ROAR_STREAMSTATE_OLD;
 
  midi_config.inited |= MIDI_INITED_MAIN;
@@ -556 +558 @@
  midi_clock_set_bph(3600); // one beat per sec
 
+ ss->state = ROAR_STREAMSTATE_NEW;
+
  midi_config.inited |= MIDI_INITED_CLOCK;
 
@@ -607 +611 @@
 
    ROAR_STREAM(ss)->pos = ROAR_MATH_OVERFLOW_ADD(ROAR_STREAM(ss)->pos, 1);
+   ss->state = ROAR_STREAMSTATE_OLD;
   } else {
    ROAR_DBG("midi_clock_tick(void): silent tick. (nt=%lu)", g_midi_clock.nt);