From 75f6b8fb6623cf3cf66cb8a80da0b9779fef2e2c Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sun, 20 Nov 2022 00:48:29 +0100 Subject: [PATCH] MainClock: rename fake setter to change_display_delta_mode We would like to introduce an actual setter, but the most appropriate name for it was used by something else: the high level callback invoked when selecting the menu item. --- gtk2_ardour/main_clock.cc | 8 ++++---- gtk2_ardour/main_clock.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index d0241f4d60..78f8150fdd 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -73,17 +73,17 @@ MainClock::build_ops_menu () mode = UIConfiguration::instance().get_secondary_clock_delta_mode (); } - ops_items.push_back (RadioMenuElem (group, _("Display absolute time"), sigc::bind (sigc::mem_fun (*this, &MainClock::set_display_delta_mode), NoDelta))); + ops_items.push_back (RadioMenuElem (group, _("Display absolute time"), sigc::bind (sigc::mem_fun (*this, &MainClock::change_display_delta_mode), NoDelta))); if (mode == NoDelta) { RadioMenuItem* i = dynamic_cast (&ops_items.back ()); i->set_active (true); } - ops_items.push_back (RadioMenuElem (group, _("Display delta to edit cursor"), sigc::bind (sigc::mem_fun (*this, &MainClock::set_display_delta_mode), DeltaEditPoint))); + ops_items.push_back (RadioMenuElem (group, _("Display delta to edit cursor"), sigc::bind (sigc::mem_fun (*this, &MainClock::change_display_delta_mode), DeltaEditPoint))); if (mode == DeltaEditPoint) { RadioMenuItem* i = dynamic_cast (&ops_items.back ()); i->set_active (true); } - ops_items.push_back (RadioMenuElem (group, _("Display delta to origin marker"), sigc::bind (sigc::mem_fun (*this, &MainClock::set_display_delta_mode), DeltaOriginMarker))); + ops_items.push_back (RadioMenuElem (group, _("Display delta to origin marker"), sigc::bind (sigc::mem_fun (*this, &MainClock::change_display_delta_mode), DeltaOriginMarker))); if (mode == DeltaOriginMarker) { RadioMenuItem* i = dynamic_cast (&ops_items.back ()); i->set_active (true); @@ -128,7 +128,7 @@ MainClock::set (timepos_t const & when, bool force) } void -MainClock::set_display_delta_mode (ClockDeltaMode m) +MainClock::change_display_delta_mode (ClockDeltaMode m) { if (_suspend_delta_mode_signal) { return; diff --git a/gtk2_ardour/main_clock.h b/gtk2_ardour/main_clock.h index b23ee4c60a..b74048e46f 100644 --- a/gtk2_ardour/main_clock.h +++ b/gtk2_ardour/main_clock.h @@ -34,7 +34,7 @@ public: private: void build_ops_menu (); - void set_display_delta_mode (ARDOUR::ClockDeltaMode); + void change_display_delta_mode (ARDOUR::ClockDeltaMode); void edit_current_tempo (); void edit_current_meter (); void insert_new_tempo ();