ardour/livetrax
13
0
Fork 0
Code

MainClock: drop 'primary' parameter

Browse Source 
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.
This commit is contained in:
Mads Kiilerich 2022-11-18 12:08:18 +01:00
parent c805ff5fdf
commit 1e77814c62
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour_ui.cc
View File

@ -277,8 +277,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
: Gtkmm2ext::UI (PROGRAM_NAME, X_("gui"), argcp, argvp) : Gtkmm2ext::UI (PROGRAM_NAME, X_("gui"), argcp, argvp)
, session_load_in_progress (false) , session_load_in_progress (false)
, gui_object_state (new GUIObjectState) , gui_object_state (new GUIObjectState)
, primary_clock (new MainClock (X_("primary"), X_("transport"), true )) , primary_clock (new MainClock (X_("primary"), X_("transport")))
, secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false)) , secondary_clock (new MainClock (X_("secondary"), X_("secondary")))
, big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
, video_timeline(0) , video_timeline(0)
, ignore_dual_punch (false) , ignore_dual_punch (false)

4
gtk2_ardour/main_clock.cc
View File

@ -37,11 +37,9 @@ using namespace ARDOUR;
MainClock::MainClock ( MainClock::MainClock (
const std::string& clock_name, const std::string& clock_name,
const std::string& widget_name, const std::string& widget_name
bool primary
) )
: AudioClock (clock_name, false, widget_name, true, true, false, true) : AudioClock (clock_name, false, widget_name, true, true, false, true)
, _primary (primary)
, _suspend_delta_mode_signal (false) , _suspend_delta_mode_signal (false)
, _widget_name(widget_name) , _widget_name(widget_name)
{ {

3
gtk2_ardour/main_clock.h
View File

@ -28,7 +28,7 @@
class MainClock : public AudioClock class MainClock : public AudioClock
{ {
public: 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_session (ARDOUR::Session *s);
void set_display_delta_mode (ARDOUR::ClockDeltaMode m); void set_display_delta_mode (ARDOUR::ClockDeltaMode m);
void set (Temporal::timepos_t const &, bool force = false); void set (Temporal::timepos_t const &, bool force = false);
@ -41,7 +41,6 @@ private:
void edit_current_meter (); void edit_current_meter ();
void insert_new_tempo (); void insert_new_tempo ();
void insert_new_meter (); void insert_new_meter ();
bool _primary;
bool _suspend_delta_mode_signal; bool _suspend_delta_mode_signal;
std::string _widget_name; std::string _widget_name;
ARDOUR::ClockDeltaMode _delta_mode; ARDOUR::ClockDeltaMode _delta_mode;