summaryrefslogtreecommitdiff
path: root/muse2/muse/steprec.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-10 12:00:09 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-10 12:00:09 +0000
commit182474fce42414f8f8c5545c4ce822aa5ce73c2c (patch)
tree72190d062480fdcedeb0079aeb269f3246731a6d /muse2/muse/steprec.cpp
parent0e67ba1af056a0df0b6b01c70bb6cb12063479a8 (diff)
steprec and dlist-enote-changing fixes
steprec now works for new style drum tracks
Diffstat (limited to 'muse2/muse/steprec.cpp')
-rw-r--r--muse2/muse/steprec.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/muse2/muse/steprec.cpp b/muse2/muse/steprec.cpp
index ea3feae7..c07a5bb8 100644
--- a/muse2/muse/steprec.cpp
+++ b/muse2/muse/steprec.cpp
@@ -55,13 +55,16 @@ void StepRec::timeout()
}
}
-void StepRec::record(Part* part, int pitch, int len, int step, int velo, bool ctrl, bool shift)
+void StepRec::record(Part* part, int pitch, int len, int step, int velo, bool ctrl, bool shift, int incoming_pitch)
{
unsigned tick = MusEGlobal::song->cpos();
unsigned lasttick=0;
Undo operations;
- if (pitch!=MusEGlobal::rcSteprecNote)
+ // if incoming_pitch wasn't specified, set it to pitch
+ if (incoming_pitch == 1337) incoming_pitch=pitch;
+
+ if (incoming_pitch!=MusEGlobal::rcSteprecNote)
{
chord_timer->stop();
@@ -132,7 +135,7 @@ void StepRec::record(Part* part, int pitch, int len, int step, int velo, bool ct
goto steprec_record_foot; // this is actually unneccessary, but for clarity
}
- else // equals if (pitch==MusEGlobal::rcSteprecNote)
+ else // equals if (incoming_pitch==MusEGlobal::rcSteprecNote)
{
bool held_notes=false;
if (note_held_down!=NULL)