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.

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 3767689cfd51c3fdba76f65f9bfcfebae021070a..c7a6724f941be7fcd6c8ded389bed4e54d6ad972 100644 (file)
--- 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 8bb685da4b807d1f0cdcb1fdba6ef71f732147e4..bbb3d5af4e0ed18f3924505cd301f1341c8e32e7 100644 (file)
--- 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 fc9075432ff3044181960452a3dd5b34a5408e1e..767216be083e5825613ec0d9b949405766db5841 100644 (file)
--- 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: