diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index f62bf54835..6ca987c8ab 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -175,7 +175,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) auditioning_alert_button (_("AUDITION")), solo_alert_button (_("SOLO")), - _menu_bar_clock (X_("menu_bar"), false, X_("MenuBarClock"), true, true, false, false), error_log_button (_("Errors")) diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e2304b85cc..fa21389741 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -534,12 +534,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr sigc::connection point_oh_five_second_connection; sigc::connection point_zero_one_second_connection; - AudioClock _menu_bar_clock; - sigc::connection _menu_bar_clock_connection; - void menu_bar_clock_value_changed (); - void show_menu_bar_clock (); - void hide_menu_bar_clock (); - gint session_menu (GdkEventButton *); bool _will_create_new_session_automatically; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index ab158ec04a..4cd9b71307 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -944,8 +944,6 @@ ARDOUR_UI::editor_realized () set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2); reset_dpi (); - - hide_menu_bar_clock (); } void @@ -960,8 +958,6 @@ ARDOUR_UI::maximise_editing_space () if (Config->get_keep_tearoffs()) { transport_tearoff->set_visible (true); } - - show_menu_bar_clock (); } void @@ -973,6 +969,4 @@ ARDOUR_UI::restore_editing_space () transport_tearoff->set_visible (true); editor->restore_editing_space (); - - hide_menu_bar_clock (); } diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 98677bb9b4..87f66632af 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -87,7 +87,6 @@ ARDOUR_UI::set_session (Session *s) big_clock.set_session (s); preroll_clock.set_session (s); postroll_clock.set_session (s); - _menu_bar_clock.set_session (s); /* sensitize menu bar options that are now valid */ diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index e3698289f7..30904e433b 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -543,9 +543,6 @@ ARDOUR_UI::build_menu_bar () use_menubar_as_top_menubar (); #endif - _menu_bar_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::menu_bar_clock_value_changed)); - menu_hbox.pack_start (_menu_bar_clock, true, false); - if (!Profile->get_small_screen()) { #ifndef GTKOSX // OSX provides its own wallclock, thank you very much @@ -782,26 +779,3 @@ ARDOUR_UI::toggle_global_port_matrix (ARDOUR::DataType t) } } } - -void -ARDOUR_UI::show_menu_bar_clock () -{ - _menu_bar_clock.show (); - _menu_bar_clock.set (_session->audible_frame (), true); - _menu_bar_clock_connection = ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (_menu_bar_clock, &AudioClock::set), 'p')); -} - -void -ARDOUR_UI::hide_menu_bar_clock () -{ - _menu_bar_clock.hide (); - _menu_bar_clock_connection.disconnect (); -} - -void -ARDOUR_UI::menu_bar_clock_value_changed () -{ - if (_session) { - _session->request_locate (_menu_bar_clock.current_time ()); - } -}