move automation show/hide methods into public access

Note that they are still intended to be called via a specific mechanism from Editor, not
directly.

Also remove unnecessary duplicate virtual decls

4 files changed, 16 insertions, 15 deletions

diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 727c46a95e..99ba8a7b8f 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -83,6 +83,10 @@ public:
 
 	void first_idle ();
 
+	void show_all_automation (bool apply_to_selection = false);
+	void show_existing_automation (bool apply_to_selection = false);
+	void hide_all_automation (bool apply_to_selection = false);
+
 private:
 	friend class AudioStreamView;
 	friend class AudioRegionView;
@@ -93,9 +97,6 @@ private:
 	Gtk::Menu* build_mode_menu();
 	void build_automation_action_menu (bool);
 
-	void show_all_automation (bool apply_to_selection = false);
-	void show_existing_automation (bool apply_to_selection = false);
-	void hide_all_automation (bool apply_to_selection = false);
 
 	void hide ();
 
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 1d24e49abd..d59e05c13e 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -149,6 +149,10 @@ public:
 
 	std::string state_id() const;
 
+	void show_all_automation (bool apply_to_selection = false);
+	void show_existing_automation (bool apply_to_selection = false);
+	void hide_all_automation (bool apply_to_selection = false);
+
 protected:
 	friend class StreamView;
 
@@ -230,10 +234,6 @@ protected:
 
 	bool         automation_click (GdkEventButton *);
 
-	virtual void show_all_automation (bool apply_to_selection = false);
-	virtual void show_existing_automation (bool apply_to_selection = false);
-	virtual void hide_all_automation (bool apply_to_selection = false);
-
 	void timestretch (samplepos_t start, samplepos_t end);
 	void speed_changed ();
 	void map_frozen ();
diff --git a/gtk2_ardour/stripable_time_axis.h b/gtk2_ardour/stripable_time_axis.h
index 899259cf9f..df0715e921 100644
--- a/gtk2_ardour/stripable_time_axis.h
+++ b/gtk2_ardour/stripable_time_axis.h
@@ -40,6 +40,10 @@ public:
 
 	void request_redraw ();
 
+	virtual void show_all_automation (bool apply_to_selection = false);
+	virtual void show_existing_automation (bool apply_to_selection = false);
+	virtual void hide_all_automation (bool apply_to_selection = false);
+
 protected:
 	void reset_samples_per_pixel ();
 	virtual void set_samples_per_pixel (double);
@@ -55,10 +59,6 @@ protected:
 	void update_trim_track_visibility ();
 	void update_mute_track_visibility ();
 
-	virtual void show_all_automation (bool apply_to_selection = false);
-	virtual void show_existing_automation (bool apply_to_selection = false);
-	virtual void hide_all_automation (bool apply_to_selection = false);
-
 	boost::shared_ptr<ARDOUR::Stripable> _stripable;
 
 	boost::shared_ptr<AutomationTimeAxisView> gain_track;
diff --git a/gtk2_ardour/vca_time_axis.h b/gtk2_ardour/vca_time_axis.h
index dd8551b1f4..f95a44465f 100644
--- a/gtk2_ardour/vca_time_axis.h
+++ b/gtk2_ardour/vca_time_axis.h
@@ -56,6 +56,10 @@ public:
 	bool marked_for_display () const;
 	bool set_marked_for_display (bool);
 
+	void show_all_automation (bool apply_to_selection = false);
+	void show_existing_automation (bool apply_to_selection = false);
+	void hide_all_automation (bool apply_to_selection = false);
+
 protected:
 	boost::shared_ptr<ARDOUR::VCA> _vca;
 	ArdourWidgets::ArdourButton    solo_button;
@@ -70,10 +74,6 @@ protected:
 	void create_trim_automation_child (const Evoral::Parameter &, bool) {}
 	void create_mute_automation_child (const Evoral::Parameter &, bool);
 
-	virtual void show_all_automation (bool apply_to_selection = false);
-	virtual void show_existing_automation (bool apply_to_selection = false);
-	virtual void hide_all_automation (bool apply_to_selection = false);
-
 	void create_automation_child (const Evoral::Parameter& param, bool show);
 	virtual void build_automation_action_menu (bool);
 	void         build_display_menu ();