summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorColin Fletcher <colin.m.fletcher@googlemail.com>2015-02-15 12:56:25 +0000
committerColin Fletcher <colin.m.fletcher@googlemail.com>2015-03-09 19:17:52 +0000
commit760e00b028f35937abc72695a02838372eb275a7 (patch)
tree5f6d810beb405ae38643db00c52fa98ed440a093 /gtk2_ardour
parent714677f036fba26df47f2ffd2547447838b3b9b3 (diff)
Remove useless parameters from MainClock constructor
Remove (always false) duration & is_transient and (always true) editable, with_info & follows_playhead parameters from MainClock constructor, and just pass the requisite true & false values along to the AudioClock constructor instead.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc4
-rw-r--r--gtk2_ardour/main_clock.cc9
-rw-r--r--gtk2_ardour/main_clock.h3
3 files changed, 5 insertions, 11 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 3767689cfd..c7a6724f94 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -161,8 +161,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, ui_config (new UIConfiguration)
, gui_object_state (new GUIObjectState)
- , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
- , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true))
+ , primary_clock (new MainClock (X_("primary"), X_("transport"), true ))
+ , secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false))
/* big clock */
diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index 8bb685da4b..bbb3d5af4e 100644
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -29,15 +29,10 @@ using namespace Gtk;
MainClock::MainClock (
const std::string& clock_name,
- bool is_transient,
const std::string& widget_name,
- bool editable,
- bool follows_playhead,
- bool primary,
- bool duration,
- bool with_info
+ bool primary
)
- : AudioClock (clock_name, is_transient, widget_name, editable, follows_playhead, duration, with_info)
+ : AudioClock (clock_name, false, widget_name, true, true, false, true)
, _primary (primary)
{
diff --git a/gtk2_ardour/main_clock.h b/gtk2_ardour/main_clock.h
index fc9075432f..767216be08 100644
--- a/gtk2_ardour/main_clock.h
+++ b/gtk2_ardour/main_clock.h
@@ -25,8 +25,7 @@
class MainClock : public AudioClock
{
public:
- MainClock (const std::string& clock_name, bool is_transient, const std::string& widget_name,
- bool editable, bool follows_playhead, bool primary, bool duration = false, bool with_info = false);
+ MainClock (const std::string& clock_name, const std::string& widget_name, bool primary);
private: