summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-08-30 20:48:37 +0200
committerRobin Gareus <robin@gareus.org>2014-08-30 20:57:27 +0200
commitdfbc9da79aef9cc05808d29a20c6d12c5d553a80 (patch)
treebdbd414e8f29816422e9cfde4d04b97193244f65 /gtk2_ardour
parent16443f44a2664bef2b3cd4c33ecaa34e8b453e1b (diff)
update clocks and video-frames at FPS
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc2
-rw-r--r--gtk2_ardour/rc_option_editor.cc2
-rw-r--r--gtk2_ardour/video_monitor.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c4baba4a10..8bb27b7f14 100644
--- 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 a6e3ab4d3b..9a636ec2f8 100644
--- 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 19db6ab7b2..4f05ef8471 100644
--- 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;
}