diff --git a/gtk2_ardour/application_bar.cc b/gtk2_ardour/application_bar.cc index 717ea977e1..9a13f347c4 100644 --- a/gtk2_ardour/application_bar.cc +++ b/gtk2_ardour/application_bar.cc @@ -553,10 +553,6 @@ ApplicationBar::parameter_changed (std::string p) } else { UI::instance()->set_tip (_sync_button, _("External sync is not possible: video pull up/down is set")); } - } else if (p == "primary-clock-delta-mode") { -// primary_clock->set_display_delta_mode(UIConfiguration::instance().get_primary_clock_delta_mode()); - } else if (p == "secondary-clock-delta-mode") { -// secondary_clock->set_display_delta_mode(UIConfiguration::instance().get_secondary_clock_delta_mode()); } else if (p == "show-mini-timeline") { repack_transport_hbox (); } else if (p == "show-dsp-load-info") { diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 6b530d89bc..8345f370eb 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2247,29 +2247,6 @@ ARDOUR_UI::save_state_canfail (string name, bool switch_to_it) return 0; } -void -ARDOUR_UI::primary_clock_value_changed () -{ - if (_session) { - _session->request_locate (primary_clock->last_when ().samples()); - } -} - -void -ARDOUR_UI::big_clock_value_changed () -{ - if (_session) { - _session->request_locate (big_clock->last_when ().samples()); - } -} - -void -ARDOUR_UI::secondary_clock_value_changed () -{ - if (_session) { - _session->request_locate (secondary_clock->last_when ().samples()); - } -} void ARDOUR_UI::save_template_dialog_response (int response, SaveTemplateDialog* d) { diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 79d4f89b07..fbedef3275 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -310,11 +310,12 @@ public: GUIObjectState* gui_object_state; - MainClock* primary_clock; - MainClock* secondary_clock; - void focus_on_clock (); + MainClock* primary_clock; //this clock is the canonical PrimaryClock, whose mode is reflected to all other clocks with PrimaryClock disposition. + MainClock* secondary_clock; //this clock is the canonical SecondaryClock, whose mode is reflected to all other clocks with PrimaryClock disposition AudioClock* big_clock; + void focus_on_clock (); + VideoTimeLine *video_timeline; void reset_main_clocks (); @@ -587,10 +588,6 @@ private: void audition_alert_clicked (); bool error_alert_press (GdkEventButton *); - void big_clock_value_changed (); - void primary_clock_value_changed (); - void secondary_clock_value_changed (); - /* menu bar and associated stuff */ Gtk::MenuBar* menu_bar; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 924263b167..1d775f6eb6 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -240,12 +240,6 @@ ARDOUR_UI::setup_transport () ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &MainClock::set), false)); ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &MainClock::set), false)); - primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); - primary_clock->change_display_delta_mode_signal.connect (sigc::mem_fun(UIConfiguration::instance(), &UIConfiguration::set_primary_clock_delta_mode)); - secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); - secondary_clock->change_display_delta_mode_signal.connect (sigc::mem_fun(UIConfiguration::instance(), &UIConfiguration::set_secondary_clock_delta_mode)); - big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); - editor_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), editor)); mixer_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), mixer)); prefs_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), rc_option_editor)); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 50c2d49d11..e3ede670af 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -384,10 +384,6 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "show-track-meters") { if (editor) editor->toggle_meter_updating(); - } else if (p == "primary-clock-delta-mode") { - primary_clock->set_display_delta_mode(UIConfiguration::instance().get_primary_clock_delta_mode()); - } else if (p == "secondary-clock-delta-mode") { - secondary_clock->set_display_delta_mode(UIConfiguration::instance().get_secondary_clock_delta_mode()); } else if (p == "super-rapid-clock-update") { if (_session) { stop_clocking ();