diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
| commit | 1057d7190242cdf9248671b316a398db805f5f56 (patch) | |
| tree | ab50268a7db2f80cfb45a7ad6578fe735ab84ce5 /muse2/muse/midi.cpp | |
| parent | 9977c7114089b8708d310268833b83343caa0fd1 (diff) | |
| parent | c36a5508aa42e596b005425208054af9a60734b4 (diff) | |
merged with trunk (that is, pulled the fixes from release_2_0)
only quickly tested, seems okay on the first glance
Diffstat (limited to 'muse2/muse/midi.cpp')
| -rw-r--r-- | muse2/muse/midi.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp index d5ed119d..85a47ead 100644 --- a/muse2/muse/midi.cpp +++ b/muse2/muse/midi.cpp @@ -25,7 +25,6 @@ #include <cmath> #include <errno.h> #include <values.h> -#include <assert.h> #include "song.h" #include "midi.h" @@ -1055,7 +1054,7 @@ void Audio::processMidi() { int pitch = ctl & 0x7f; // pitch is now the incoming pitch pitch = track->map_drum_in(pitch); // pitch is now the mapped (recorded) pitch - event.setA(ctl & ~0xff | pitch); // map the drum ctrl's value accordingly + event.setA((ctl & ~0xff) | pitch); // map the drum ctrl's value accordingly if (MusEGlobal::config.newDrumRecordCondition & MusECore::DONT_REC_HIDDEN && track->drummap_hidden()[pitch] ) |