Changeset 371 for trunk/libs/hydrogen/src/sampler/sampler.cpp

Timestamp:

08/21/08 23:52:14 (5 years ago)

Author:

jakoblund

Message:

Make deletion of instruments crash-proof by using a per-note reference count

Files:

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

trunk/libs/hydrogen/src/sampler/sampler.cpp

@@ -109 +109 @@
                 Note *oldNote = __playing_notes_queue[ 0 ];
                 __playing_notes_queue.erase( __playing_notes_queue.begin() );
+                oldNote->get_instrument()->dequeue();
                 delete oldNote; // FIXME: send note-off instead of removing the note from the list?
         }
@@ -121 +122 @@
                 if ( res == 1 ) {       // la nota e' finita
                         __playing_notes_queue.erase( __playing_notes_queue.begin() + i );
+                        pNote->get_instrument()->dequeue();
                         delete pNote;
                         pNote = NULL;
@@ -658 +660 @@
                         if ( pNote->get_instrument() == instrument ) {
                                 delete pNote;
+                                instrument->dequeue();
                                 __playing_notes_queue.erase( __playing_notes_queue.begin() + i );
                         }
@@ -666 +669 @@
                 for ( unsigned i = 0; i < __playing_notes_queue.size(); ++i ) {
                         Note *pNote = __playing_notes_queue[i];
+                        pNote->get_instrument()->dequeue();
                         delete pNote;
                 }
@@ -689 +693 @@
         stop_playing_notes( __preview_instrument );
         note_on( previewNote );
+        __preview_instrument->enqueue();
 
         AudioEngine::get_instance()->unlock();
@@ -697 +702 @@
 void Sampler::preview_instrument( Instrument* instr )
 {
+        Instrument * old_preview;
         AudioEngine::get_instance()->lock( "Sampler::previewInstrument" );
 
         stop_playing_notes( __preview_instrument );
 
-        delete __preview_instrument;
+        old_preview = __preview_instrument
         __preview_instrument = instr;
 
@@ -707 +713 @@
 
         note_on( previewNote ); // exclusive note
+        instr->enqueue();
         AudioEngine::get_instance()->unlock();
+        delete old_preview;
 }