Changeset 333 for trunk/libs/hydrogen/src/hydrogen.cpp

Timestamp:

08/17/08 21:45:13 (5 years ago)

Author:

wolke

Message:

prevent, that used notes in pattern and the needed instruments will not deleted if a smaller drumkit will loaded.

Files:

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

trunk/libs/hydrogen/src/hydrogen.cpp

@@ +1 @@
+#include "libs/hydrogen/include/hydrogen/note.h" /* defines Note */
 /*
  * Hydrogen
@@ -2239 +2240 @@
 void Hydrogen::functionDeleteInstrument( int instrumentnumber)
 {
-        AudioEngine::get_instance()->lock("InstrumentLine::Hydrogen::functionDeleteInstrument");
+//      hi seems that it not necessary to lock the audio engine for this process
+//      AudioEngine::get_instance()->lock("InstrumentLine::Hydrogen::functionDeleteInstrument");
         Instrument *pInstr = m_pSong->get_instrument_list()->get( instrumentnumber );
 
@@ -2247 +2249 @@
         }
 
+
+        // new! this check if a pattern has an active note 
+        //if there is an note inside the pattern the intrument would not be deleted
+        PatternList* pPatternList = getSong()->get_pattern_list();
+        for ( int nPattern = 0; nPattern < (int)pPatternList->get_size(); ++nPattern ) {
+                H2Core::Pattern *pPattern = pPatternList->get( nPattern );
+
+                std::multimap <int, Note*>::iterator pos;
+                for ( pos = pPattern->note_map.begin(); pos != pPattern->note_map.end(); ++pos ) {
+                        Note *pNote = pos->second;
+                        assert( pNote );
+                        if ( pNote->get_instrument() == pInstr ) {
+                                if( pNote->get_velocity() >= 0.0){ 
+//                                      AudioEngine::get_instance()->unlock();
+                                        return;
+                                }
+                        }
+                }
+        }
+
         // delete the instrument from the instruments list
         getSong()->get_instrument_list()->del( instrumentnumber );
         getSong()->__is_modified = true;
 
-
         // delete all the notes using this instrument
-        PatternList* pPatternList = getSong()->get_pattern_list();
+//      PatternList* pPatternList = getSong()->get_pattern_list();
         for ( int nPattern = 0; nPattern < (int)pPatternList->get_size(); ++nPattern ) {
                 H2Core::Pattern *pPattern = pPatternList->get( nPattern );
@@ -2273 +2294 @@
         delete pInstr;
 
-        AudioEngine::get_instance()->unlock();
+//      AudioEngine::get_instance()->unlock();
 
         // this will force an update...