X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpanner.cc;h=c70c8ea790354b55f9faa2197a63bf0a38a2103e;hb=4250940ad83200e065b966d0646c75a48bb0f73d;hp=c88fbe44f430e1a9f679dfcc84365d611e4e1417;hpb=1db2be2fef7a70f5200bcd96a701f612bbd7ec52;p=ardour.git

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index c88fbe44f4..c70c8ea790 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -22,7 +22,7 @@
 #include "ardour/panner.h"
 #include "ardour/pannable.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -57,7 +57,7 @@ Panner::distribute (BufferSet& ibufs, BufferSet& obufs, gain_t gain_coeff, pfram
 
 void
 Panner::distribute_automated (BufferSet& ibufs, BufferSet& obufs,
-                              framepos_t start, framepos_t end, pframes_t nframes, pan_t** buffers)
+                              samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers)
 {
 	uint32_t which = 0;
 
@@ -66,12 +66,6 @@ Panner::distribute_automated (BufferSet& ibufs, BufferSet& obufs,
 	}
 }
 
-void
-Panner::set_automation_style (AutoStyle style)
-{
-	_pannable->set_automation_style (style);
-}
-
 void
 Panner::set_automation_state (AutoState state)
 {
@@ -84,12 +78,6 @@ Panner::automation_state () const
 	return _pannable->automation_state();
 }
 
-AutoStyle
-Panner::automation_style () const
-{
-	return _pannable->automation_style ();
-}
-
 bool
 Panner::touching () const
 {
@@ -109,7 +97,7 @@ Panner::describe_parameter (Evoral::Parameter p)
 }
 
 string
-Panner::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+Panner::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
 	return _pannable->value_as_string (ac);
 }