From 9e763c26722c18174471afe71eb855b81b7a41e9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 11 Oct 2021 17:48:44 -0600 Subject: [PATCH] remove all dangling event-loop-precall code --- gtk2_ardour/ardour_ui.cc | 5 ----- gtk2_ardour/ardour_ui.h | 2 -- libs/pbd/base_ui.cc | 4 ---- libs/pbd/pbd/base_ui.h | 6 ------ libs/surfaces/control_protocol/control_protocol.cc | 6 ------ .../control_protocol/control_protocol/control_protocol.h | 2 -- libs/surfaces/generic_midi/generic_midi_control_protocol.h | 2 -- libs/surfaces/mackie/mackie_control_protocol.h | 2 -- 8 files changed, 29 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 9cb50c00ec..df72a9352e 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3119,8 +3119,3 @@ ARDOUR_UI::setup_toplevel_window (Gtk::Window& window, const string& name, void* window.signal_key_release_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_event_handler), &window), false); } -void -ARDOUR_UI::event_loop_precall () -{ - Temporal::TempoMap::fetch (); -} diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 43f4d6f880..da5690860e 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -410,8 +410,6 @@ protected: void toggle_rc_options_window (); void toggle_session_options_window (); - void event_loop_precall (); - private: Gtk::Window _main_window; diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc index 96cffa55e9..a4ea861c29 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -176,7 +176,3 @@ BaseUI::attach_request_source () request_channel.attach (m_context); } -void -BaseUI::event_loop_precall () -{ -} diff --git a/libs/pbd/pbd/base_ui.h b/libs/pbd/pbd/base_ui.h index a17dc33b01..af501fc666 100644 --- a/libs/pbd/pbd/base_ui.h +++ b/libs/pbd/pbd/base_ui.h @@ -75,12 +75,6 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop */ void quit (); - /* derived classes can override this in order to call code once per - main loop iteration (i.e. before any event dispatching is done - within the main loop) - */ - virtual void event_loop_precall (); - protected: bool _ok; diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index 4010732918..cf445bc095 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -380,9 +380,3 @@ ControlProtocol::notify_stripable_selection_changed (StripableNotificationListPt _last_selected = *sp; } -void -ControlProtocol::event_loop_precall () -{ - Temporal::TempoMap::fetch (); -} - diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index 9f0432f403..8f86235c83 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -141,8 +141,6 @@ public: static StripableNotificationList const& last_selected () { return _last_selected; } static void notify_stripable_selection_changed (StripableNotificationListPtr); - void event_loop_precall (); - protected: void next_track (uint32_t initial_id); void prev_track (uint32_t initial_id); diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index fa80f6d6fa..4b8f7c9d7b 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -204,8 +204,6 @@ private: bool midi_input_handler (Glib::IOCondition ioc, boost::weak_ptr port); void start_midi_handling (); void stop_midi_handling (); - - void event_loop_precall () { ControlProtocol::event_loop_precall(); } }; #endif /* ardour_generic_midi_control_protocol_h */ diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index a0326a790e..e2028b7f4e 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -276,8 +276,6 @@ class MackieControlProtocol bool stripable_is_locked_to_strip (boost::shared_ptr) const; - void event_loop_precall () { ControlProtocol::event_loop_precall(); } - private: struct ButtonHandlers {