summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2013-01-16 07:40:29 +0000
committerTim E. Real <termtech@rogers.com>2013-01-16 07:40:29 +0000
commit48a4361dc66411d0edb0f92826a1fb6b0e06c386 (patch)
treed2e99059fa7e90cdbdedf0d12b40017c2e0ede7e /muse2
parent78d5201caed32cb1e55de85287bd3b9fab325bd4 (diff)
Don't play midi parts if track is off
Diffstat (limited to 'muse2')
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/midi.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 81329e66..77506419 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -11,6 +11,7 @@
TODO: Found C.O.W. bug when de-cloning a part on a duplicated Wave Track - it's still a clone. Investigating...
- Fixed Old-style Drum Editor: Was not playing new notes as they were drawn. Re-wrote a DrumCanvas::newItem(),
and eliminated dynamic_casts.
+ - Don't play midi parts if track is off.
13.01.2013:
- remote should depend on widgets through #including app.h otherwise Python bindings don't compile (Orcan)
03.01.2013:
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp
index e5b1c62a..61053739 100644
--- a/muse2/muse/midi.cpp
+++ b/muse2/muse/midi.cpp
@@ -942,8 +942,8 @@ void Audio::processMidi()
MidiDevice* md = MusEGlobal::midiPorts[port].device();
if(md)
{
- // only add track events if the track is unmuted
- if(!track->isMute())
+ // only add track events if the track is unmuted and turned on
+ if(!track->isMute() && !track->off())
{
if(isPlaying() && (curTickPos < nextTickPos))
collectEvents(track, curTickPos, nextTickPos);