Changeset 414

Timestamp:

08/29/08 00:53:11 (4 months ago)

Author:

gabriel

Message:

Moved up lock on stopping audio drivers. Was segfaulting in Sampler and Note.

On exit, Hydrogen would sometimes segfault with one of the following:

hydrogen: libs/hydrogen/src/sampler/sampler.cpp:91: void H2Core::Sampler::process(uint32_t, H2Core::Song*): Assertion `audio_output' failed.

hydrogen: libs/hydrogen/src/note.cpp:107: void H2Core::Note::set_instrument(H2Core::Instrument*): Assertion `instrument->get_adsr()' failed.

This could sometimes be forced by playing a lot of notes and exiting
while playing (note.cpp), but the assert in sampler.cpp would happen
under any circumstances.

Backported from jackMidi branch.

Files:

• trunk/libs/hydrogen/src/hydrogen.cpp (modified) (2 diffs)

trunk/libs/hydrogen/src/hydrogen.cpp

@@ -1555 +1555 @@
-        _INFOLOG( "[audioEngine_stopAudioDrivers]" );
-
+        AudioEngine::get_instance()->lock( "audioEngine_stopAudioDrivers" );
+
-        // check current state
-        if ( m_audioEngineState == STATE_PLAYING ) {
@@ -1582 +1584 @@
-
-
-        AudioEngine::get_instance()->lock( "audioEngine_stopAudioDrivers" );
-        // change the current audio engine state
-        m_audioEngineState = STATE_INITIALIZED;