X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fpanner.cc;h=c70c8ea790354b55f9faa2197a63bf0a38a2103e;hb=79f01bc889d6c928345214eaba9016c6396bcfca;hp=0713e48fe50fd7d7b486ec954e3f98b5ac90a5b8;hpb=f871d665d59e3b95f9d47a80e5caead15d9a705b;p=ardour.git

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 0713e48fe5..c70c8ea790 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -17,22 +17,18 @@
 
 */
 
-#include "pbd/boost_debug.h"
-
-#include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/panner.h"
 #include "ardour/pannable.h"
-#include "ardour/session.h"
-#include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 
 Panner::Panner (boost::shared_ptr<Pannable> p)
+	: _frozen (0)
 {
 	// boost_debug_shared_ptr_mark_interesting (this, "panner");
 	_pannable = p;
@@ -61,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;
 
@@ -70,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)
 {
@@ -88,12 +78,6 @@ Panner::automation_state () const
 	return _pannable->automation_state();
 }
 
-AutoStyle
-Panner::automation_style () const
-{
-	return _pannable->automation_style ();
-}
-
 bool
 Panner::touching () const
 {
@@ -113,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);
 }
@@ -123,3 +107,17 @@ Panner::set_state (XMLNode const &, int)
 {
 	return 0;
 }
+
+void
+Panner::freeze ()
+{
+	_frozen++;
+}
+
+void
+Panner::thaw ()
+{
+	if (_frozen > 0.0) {
+		_frozen--;
+	}
+}