summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_track.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-12-19 01:20:37 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-12-19 01:20:37 +0000
commit99c848455aca397335c3d57e85c3f7c82f5b0a9d (patch)
treecd0b6396e746de976fd94f5896e06e89225b6ae4 /libs/ardour/midi_track.cc
parent844ce9f359255a5109fb481dd7d727618f2cde1a (diff)
prevent MIDI tracks from ever being in MonitoringSilence state, allows use of piano roll whether rolling or not
git-svn-id: svn://localhost/ardour2/branches/3.0@13679 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_track.cc')
-rw-r--r--libs/ardour/midi_track.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 2226574e6a..7f2bb641e1 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -352,7 +352,9 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
MidiBuffer& mbuf (bufs.get_midi (0));
- /* we are a MIDI track, so we always start the chain with a single-channel diskstream */
+ /* we are a MIDI track, so we always start the chain with a
+ * single-MIDI-channel diskstream
+ */
ChanCount c;
c.set_audio (0);
c.set_midi (1);
@@ -772,3 +774,12 @@ MidiTrack::set_monitoring (MonitorChoice mc)
}
}
+MonitorState
+MidiTrack::monitoring_state () const
+{
+ MonitorState ms = Track::monitoring_state();
+ if (ms == MonitoringSilence) {
+ return MonitoringInput;
+ }
+ return ms;
+}