Initial changes needed for building Mixbus (with MSVC) as version 5

[ardour.git] / libs / ardour / panner.cc

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 2f52cb26d897700bc1e2419db8ae6209ea04ac38..c70c8ea790354b55f9faa2197a63bf0a38a2103e 100644 (file)
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -22,12 +22,13 @@
 #include "ardour/panner.h"
 #include "ardour/pannable.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;
@@ -56,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;
 
@@ -65,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)
 {
@@ -83,12 +78,6 @@ Panner::automation_state () const
        return _pannable->automation_state();
 }
 
-AutoStyle
-Panner::automation_style () const
-{
-       return _pannable->automation_style ();
-}
-
 bool
 Panner::touching () const
 {
@@ -108,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);
 }