Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / video_monitor.cc

diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 2e6f5157bfe764ea8b87a18b0d457b09a97f6358..6b06f917445be002fe7fc09c40cfed985f795f2d 100644 (file)
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -94,7 +94,7 @@ VideoMonitor::query_full_state (bool wait)
        process->write_to_stdin("get osdcfg\n");
        int timeout = 40;
        if (wait && knownstate !=127 && --timeout) {
-               usleep(50000);
+               Glib::usleep(50000);
                sched_yield();
        }
 }
@@ -113,7 +113,7 @@ VideoMonitor::quit ()
         */
        int timeout = 40;
        while (is_started() && --timeout) {
-               usleep(50000);
+               Glib::usleep(50000);
                sched_yield();
        }
        if (timeout <= 0) {
@@ -202,7 +202,6 @@ VideoMonitor::send_cmd (int what, int param)
        bool osd_update = false;
        int prev_osdmode = osdmode;
        if (!is_started()) return;
-       printf("VideoMonitor::send_cmd %d %d\n", what, param); fflush(stdout);
        switch (what) {
                case 1:
                        if (param) process->write_to_stdin("window ontop on\n");
@@ -555,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;
        }