advance track's play-position even if processing is locked

[ardour.git] / libs / ardour / midi_track.cc

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 0f1b2b52afa29391652fc90a0b25c3530fb76f1a..f88c331c2ca8a0e7b171b7f1a4aea9a5f9ac7ba9 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -83,7 +83,7 @@ MidiTrack::create_diskstream ()
 {
        MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0);
 
-       if (_flags & Hidden) {
+       if (_flags & Auditioner) {
                dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden);
        } else {
                dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Recordable);
@@ -169,7 +169,7 @@ MidiTrack::set_state (const XMLNode& node, int version)
                playback_channel_mode = ChannelMode (string_2_enum(prop->value(), playback_channel_mode));
        }
        if ((prop = node.property ("capture-channel-mode")) != 0) {
-               playback_channel_mode = ChannelMode (string_2_enum(prop->value(), capture_channel_mode));
+               capture_channel_mode = ChannelMode (string_2_enum(prop->value(), capture_channel_mode));
        }
        if ((prop = node.property ("channel-mode")) != 0) {
                /* 3.0 behaviour where capture and playback modes were not separated */
@@ -319,6 +319,12 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 {
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
+               boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
+               framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
+               if (can_internal_playback_seek(llabs(playback_distance))) {
+                       /* TODO should declick, and/or note-off */
+                       internal_playback_seek(playback_distance);
+               }
                return 0;
        }
 
@@ -330,6 +336,9 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 
        if (!_active) {
                silence (nframes);
+               if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
+                       _meter->reset();
+               }
                return 0;
        }
 
@@ -350,11 +359,11 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
                return dret;
        }
 
-       BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
+       BufferSet& bufs = _session.get_route_buffers (n_process_buffers());
 
        fill_buffers_with_input (bufs, _input, nframes);
 
-       if (_meter_point == MeterInput) {
+       if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
                _meter->run (bufs, start_frame, end_frame, nframes, true);
        }