diff options
author | Florian Jung <flo@windfisch.org> | 2011-06-29 18:43:33 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-06-29 18:43:33 +0000 |
commit | 363cebc27a30edcca80fe24f1b535dc0b39efd15 (patch) | |
tree | f536af6f7b8dab7547f058a5a26019b91f282606 /muse2/muse/midiedit/dcanvas.cpp | |
parent | 9633b537bea22bc753ca8e3e0481fd38419524ae (diff) |
added autoexpand to steprec.cpp
reformatted StepRec::record to Allman style ("my" style)
fixed a bug in steprec.cpp: parts with tick() being !=0 were
treated wrong
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.cpp')
-rw-r--r-- | muse2/muse/midiedit/dcanvas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp index 4b5c3ea9..b9ff5a20 100644 --- a/muse2/muse/midiedit/dcanvas.cpp +++ b/muse2/muse/midiedit/dcanvas.cpp @@ -731,7 +731,7 @@ void DrumCanvas::keyPressed(int index, int velocity) MidiPlayEvent e(0, port, channel, 0x90, pitch, velocity); audio->msgPlayMidiEvent(&e); - if (_steprec && pos[0] >= start_tick && pos[0] < end_tick && curPart) + if (_steprec && pos[0] >= start_tick /* && pos[0] < end_tick [removed by flo93: this is handled in steprec->record] */ && curPart) steprec->record(curPart,index,drumMap[index].len,editor->raster(),velocity,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier); } @@ -1120,7 +1120,7 @@ void DrumCanvas::midiNote(int pitch, int velo) if (_midiin && _steprec && curPart && !audio->isPlaying() && velo && pos[0] >= start_tick - && pos[0] < end_tick + /* && pos[0] < end_tick [removed by flo93: this is handled in steprec->record] */ && !(globalKeyState & Qt::AltModifier)) { steprec->record(curPart,drumInmap[pitch],drumMap[(int)drumInmap[pitch]].len,editor->raster(),velo,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier); } |