Pan: remove automation-state indirection 2/2

3 files changed, 2 insertions, 25 deletions

diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index f328b7818b..a857defb5b 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -107,11 +107,6 @@ public:
 	/* azimut, width or elevation updated -> recalc signal_position ->  emit Changed */
 	PBD::Signal0<void> SignalPositionChanged;
 
-	void      set_automation_state (AutoState);
-	AutoState automation_state() const;
-
-	bool touching() const;
-
 	/**
 	 *  Pan some input buffers to a number of output buffers.
 	 *
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 5ffb2ade88..39ca1f03de 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -68,24 +68,6 @@ Panner::distribute_automated (BufferSet& ibufs, BufferSet& obufs,
 	}
 }
 
-void
-Panner::set_automation_state (AutoState state)
-{
-	_pannable->set_automation_state (state);
-}
-
-AutoState
-Panner::automation_state () const
-{
-	return _pannable->automation_state();
-}
-
-bool
-Panner::touching () const
-{
-	return _pannable->touching ();
-}
-
 int
 Panner::set_state (XMLNode const &, int)
 {
diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index ac3a93c615..5269085d0c 100644
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -386,11 +386,11 @@ PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, samplepos_t start_sampl
 
 	// More than 1 output
 
-	AutoState as = _panner->automation_state ();
+	AutoState as = pannable ()->automation_state ();
 
 	// If we shouldn't play automation defer to distribute_no_automation
 
-	if (!((as & Play) || ((as & (Touch | Latch)) && !_panner->touching()))) {
+	if (!((as & Play) || ((as & (Touch | Latch)) && !pannable ()->touching ()))) {
 
 		distribute_no_automation (inbufs, outbufs, nframes, 1.0);