X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpanners%2F2in2out%2Fpanner_2in2out.cc;h=e9d9ced0cab548a70e65963872a63872f4b141b3;hb=30b087ab3d28f1585987fa3f6ae006562ae192e3;hp=3cfc3585305a98bafdac5d865340f4e79c416838;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc
index 3cfc358530..e9d9ced0ca 100644
--- a/libs/panners/2in2out/panner_2in2out.cc
+++ b/libs/panners/2in2out/panner_2in2out.cc
@@ -21,14 +21,12 @@
 
 #include <cmath>
 #include <cerrno>
-#include <fstream>
 #include <cstdlib>
 #include <string>
 #include <cstdio>
 #include <locale.h>
 #include <unistd.h>
 #include <float.h>
-#include <iomanip>
 
 #include <glibmm.h>
 
@@ -53,7 +51,7 @@
 
 #include "panner_2in2out.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/mathfix.h"
 
@@ -76,8 +74,8 @@ Panner2in2out::Panner2in2out (boost::shared_ptr<Pannable> p)
 	: Panner (p)
 {
         if (!_pannable->has_state()) {
-                _pannable->pan_azimuth_control->set_value (0.5);
-                _pannable->pan_width_control->set_value (1.0);
+	        _pannable->pan_azimuth_control->set_value (0.5, Controllable::NoGroup);
+	        _pannable->pan_width_control->set_value (1.0, Controllable::NoGroup);
         }
 
         double const w = width();
@@ -121,7 +119,7 @@ void
 Panner2in2out::set_position (double p)
 {
         if (clamp_position (p)) {
-                _pannable->pan_azimuth_control->set_value (p);
+	        _pannable->pan_azimuth_control->set_value (p, Controllable::NoGroup);
         }
 }
 
@@ -129,7 +127,7 @@ void
 Panner2in2out::set_width (double p)
 {
         if (clamp_width (p)) {
-                _pannable->pan_width_control->set_value (p);
+	        _pannable->pan_width_control->set_value (p, Controllable::NoGroup);
         }
 }
 
@@ -282,7 +280,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 	if (fabsf ((delta = (left[which] - desired_left[which]))) > 0.002) { // about 1 degree of arc
 
 		/* we've moving the pan by an appreciable amount, so we must
-		   interpolate over 64 frames or nframes, whichever is smaller */
+		   interpolate over 64 samples or nframes, whichever is smaller */
 
 		pframes_t const limit = min ((pframes_t) 64, nframes);
 		pframes_t n;
@@ -338,7 +336,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 	if (fabsf ((delta = (right[which] - desired_right[which]))) > 0.002) { // about 1 degree of arc
 
 		/* we're moving the pan by an appreciable amount, so we must
-		   interpolate over 64 frames or nframes, whichever is smaller */
+		   interpolate over 64 samples or nframes, whichever is smaller */
 
 		pframes_t const limit = min ((pframes_t) 64, nframes);
 		pframes_t n;
@@ -389,7 +387,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 
 void
 Panner2in2out::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
-                                         framepos_t start, framepos_t end, pframes_t nframes,
+                                         samplepos_t start, samplepos_t end, pframes_t nframes,
                                          pan_t** buffers, uint32_t which)
 {
 	assert (obufs.count().n_audio() == 2);
@@ -481,9 +479,9 @@ XMLNode&
 Panner2in2out::get_state ()
 {
 	XMLNode& root (Panner::get_state ());
-	root.add_property (X_("uri"), _descriptor.panner_uri);
+	root.set_property (X_("uri"), _descriptor.panner_uri);
 	/* this is needed to allow new sessions to load with old Ardour: */
-	root.add_property (X_("type"), _descriptor.name);
+	root.set_property (X_("type"), _descriptor.name);
 	return root;
 }
 
@@ -510,7 +508,7 @@ Panner2in2out::describe_parameter (Evoral::Parameter p)
 }
 
 string
-Panner2in2out::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+Panner2in2out::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
         /* DO NOT USE LocaleGuard HERE */
         double val = ac->get_value();