update clocks and video-frames at FPS

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c4baba4a105944db5306b241992c4cc20bf6f3e3..8bb27b7f1433cb55b98f2a4f6905b15cb5473d63 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2249,7 +2249,7 @@ void
 ARDOUR_UI::start_clocking ()
 {
        if (Config->get_super_rapid_clock_update()) {
-               clock_signal_connection = SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
+               clock_signal_connection = FPSUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
        } else {
                clock_signal_connection = RapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
        }

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index a6e3ab4d3bf661d103a95a9b4a4276e85579e8e5..9a636ec2f85c3c1fadab502d1326a2063a11b2b8 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2172,7 +2172,7 @@ RCOptionEditor::RCOptionEditor ()
        add_option (S_("GUI"),
                    new BoolOption (
                            "super-rapid-clock-update",
-                           _("update transport clock display every 40ms instead of every 100ms"),
+                           _("update transport clock display at FPS instead of every 100ms"),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::get_super_rapid_clock_update),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_super_rapid_clock_update)
                            ));

diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 19db6ab7b2553f1edb1def553be90604ed671de3..4f05ef84714d6395e31df1208306362026d50aa4 100644 (file)
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -162,7 +162,7 @@ VideoMonitor::open (std::string filename)
                state_connection = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::querystate));
        }
        sync_by_manual_seek = true;
-       clock_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
+       clock_connection = ARDOUR_UI::FPSUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
        xjadeo_sync_setup();
 }
 
@@ -570,7 +570,7 @@ VideoMonitor::xjadeo_sync_setup ()
                        process->write_to_stdin("jack connect\n");
                } else {
                        process->write_to_stdin("jack disconnect\n");
-                       clock_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
+                       clock_connection = ARDOUR_UI::FPSUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
                }
                sync_by_manual_seek = my_manual_seek;
        }