merge with master and fix 2 conflicts

[ardour.git] / gtk2_ardour / video_monitor.cc

diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 3f69eea6e628dbd62e84f5d7fa9c044ad5d68f51..238845fb2fd1d4dc1ea445ad8e52cc9e5cefde26 100644 (file)
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -554,7 +554,7 @@ VideoMonitor::xjadeo_sync_setup ()
 
        bool my_manual_seek = true;
        if (_session->config.get_external_sync()) {
-               if (ARDOUR::Config->get_sync_source() == ARDOUR::JACK)
+               if (ARDOUR::Config->get_sync_source() == ARDOUR::Engine)
                        my_manual_seek = false;
        }