From 1e77814c62259908a7f371f09d4d412f35e47090 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Fri, 18 Nov 2022 12:08:18 +0100 Subject: [PATCH] MainClock: drop 'primary' parameter The main clock no longer use direct access to the config system, and is no longer restricted to know whether it is primary clock or not. --- gtk2_ardour/ardour_ui.cc | 4 ++-- gtk2_ardour/main_clock.cc | 4 +--- gtk2_ardour/main_clock.h | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index c647681c62..b33f81f288 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -277,8 +277,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) : Gtkmm2ext::UI (PROGRAM_NAME, X_("gui"), argcp, argvp) , session_load_in_progress (false) , gui_object_state (new GUIObjectState) - , primary_clock (new MainClock (X_("primary"), X_("transport"), true )) - , secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false)) + , primary_clock (new MainClock (X_("primary"), X_("transport"))) + , secondary_clock (new MainClock (X_("secondary"), X_("secondary"))) , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) , video_timeline(0) , ignore_dual_punch (false) diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index f038b939c4..867ac3b59c 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -37,11 +37,9 @@ using namespace ARDOUR; MainClock::MainClock ( const std::string& clock_name, - const std::string& widget_name, - bool primary + const std::string& widget_name ) : AudioClock (clock_name, false, widget_name, true, true, false, true) - , _primary (primary) , _suspend_delta_mode_signal (false) , _widget_name(widget_name) { diff --git a/gtk2_ardour/main_clock.h b/gtk2_ardour/main_clock.h index 4d26996cb0..9050f83128 100644 --- a/gtk2_ardour/main_clock.h +++ b/gtk2_ardour/main_clock.h @@ -28,7 +28,7 @@ class MainClock : public AudioClock { public: - MainClock (const std::string& clock_name, const std::string& widget_name, bool primary); + MainClock (const std::string& clock_name, const std::string& widget_name); void set_session (ARDOUR::Session *s); void set_display_delta_mode (ARDOUR::ClockDeltaMode m); void set (Temporal::timepos_t const &, bool force = false); @@ -41,7 +41,6 @@ private: void edit_current_meter (); void insert_new_tempo (); void insert_new_meter (); - bool _primary; bool _suspend_delta_mode_signal; std::string _widget_name; ARDOUR::ClockDeltaMode _delta_mode;