Changeset 404 for branches/jackMidi/gui/src/PatternEditor/DrumPatternEditor.cpp

Timestamp:

08/25/08 23:44:45 (5 years ago)

Author:

gabriel

Message:

Merge rev 378:381 from trunk

Conflicts:

libs/hydrogen/src/hydrogen.cpp

Files:

• branches/jackMidi/gui/src/PatternEditor/DrumPatternEditor.cpp (modified) (1 diff)

branches/jackMidi/gui/src/PatternEditor/DrumPatternEditor.cpp

@@ -193 +193 @@
                                 Note *pNote2 = new Note( pSelectedInstrument, 0, fVelocity, fPan_L, fPan_R, nLength, fPitch);
                                 AudioEngine::get_instance()->get_sampler()->note_on(pNote2);
-                                pSelectedInstrument->enqueue();
+//                              pSelectedInstrument->enqueue();
                         }
                 }