redesign Route and VCA objects to inherit from ARDOUR::Stripable

1 files changed, 11 insertions, 10 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index ed32769058..b187c39629 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -48,6 +48,7 @@
 #include "ardour/types.h"
 #include "ardour/mute_master.h"
 #include "ardour/route_group_member.h"
+#include "ardour/stripable.h"
 #include "ardour/graphnode.h"
 #include "ardour/automatable.h"
 #include "ardour/unknown_processor.h"
@@ -74,7 +75,7 @@ class CapturingProcessor;
 class InternalSend;
 class VCA;
 
-class LIBARDOUR_API Route : public SessionObject, public Automatable, public RouteGroupMember, public GraphNode, public boost::enable_shared_from_this<Route>
+class LIBARDOUR_API Route : public Stripable, public Automatable, public RouteGroupMember, public GraphNode, public boost::enable_shared_from_this<Route>
 {
 public:
 
@@ -203,8 +204,8 @@ public:
 
 	boost::shared_ptr<Amp> amp() const  { return _amp; }
 	boost::shared_ptr<Amp> trim() const { return _trim; }
-	PeakMeter&       peak_meter()       { return *_meter.get(); }
-	const PeakMeter& peak_meter() const { return *_meter.get(); }
+	boost::shared_ptr<PeakMeter>       peak_meter()       { return _meter; }
+	boost::shared_ptr<const PeakMeter> peak_meter() const { return _meter; }
 	boost::shared_ptr<PeakMeter> shared_peak_meter() const { return _meter; }
 	boost::shared_ptr<DelayLine> delay_line() const  { return _delayline; }
 
@@ -560,11 +561,11 @@ public:
 
 	void set_control (AutomationType, double val, PBD::Controllable::GroupControlDisposition group_override);
 
-	boost::shared_ptr<SoloControllable> solo_control() const {
+	boost::shared_ptr<AutomationControl> solo_control() const {
 		return _solo_control;
 	}
 
-	boost::shared_ptr<MuteControllable> mute_control() const {
+	boost::shared_ptr<AutomationControl> mute_control() const {
 		return _mute_control;
 	}
 
@@ -572,11 +573,11 @@ public:
 		return _mute_master;
 	}
 
-	boost::shared_ptr<SoloIsolateControllable> solo_isolate_control() const {
+	boost::shared_ptr<AutomationControl> solo_isolate_control() const {
 		return _solo_isolate_control;
 	}
 
-	boost::shared_ptr<SoloSafeControllable> solo_safe_control() const {
+	boost::shared_ptr<AutomationControl> solo_safe_control() const {
 		return _solo_safe_control;
 	}
 
@@ -594,11 +595,11 @@ public:
 
 	boost::shared_ptr<Panner> panner() const;  /* may return null */
 	boost::shared_ptr<PannerShell> panner_shell() const;
-	boost::shared_ptr<GainControl> gain_control() const;
 	boost::shared_ptr<Pannable> pannable() const;
-	boost::shared_ptr<GainControl> trim_control() const;
 
-	boost::shared_ptr<PhaseControllable> phase_control() const;
+	boost::shared_ptr<GainControl> gain_control() const;
+	boost::shared_ptr<AutomationControl> trim_control() const;
+	boost::shared_ptr<AutomationControl> phase_control() const;
 
 	/**
 	   Return the first processor that accepts has at least one MIDI input