Use glibmm to simplify my earlier efforts with 'user_config_directory()' and 'user_ca...

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

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 7d90709b6ff01c493202eaa18e5b3003dbacf182..57239cb841a35201f9d9438bdee416e984978e3f 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -477,6 +477,10 @@ Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*
 {
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
+               framecnt_t playback_distance = _diskstream->calculate_playback_distance(nframes);
+               if (can_internal_playback_seek(playback_distance)) {
+                       internal_playback_seek(playback_distance);
+               }
                return 0;
        }
 
@@ -546,15 +550,15 @@ Track::playlist ()
 }
 
 void
-Track::request_jack_monitors_input (bool m)
+Track::request_input_monitoring (bool m)
 {
-       _diskstream->request_jack_monitors_input (m);
+       _diskstream->request_input_monitoring (m);
 }
 
 void
-Track::ensure_jack_monitors_input (bool m)
+Track::ensure_input_monitoring (bool m)
 {
-       _diskstream->ensure_jack_monitors_input (m);
+       _diskstream->ensure_input_monitoring (m);
 }
 
 bool