Merge branch 'master' into windows+cc

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

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 6e193c3c099eb6aa56e1215d0fd024d9530e5356..6a998de90e42b1c1565a3fbf938b4dcd03836ab6 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -318,6 +318,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;
        }