add ActionManager::set_sensitive() for Gtk::ActionGroup

[ardour.git] / libs / panners / 1in2out / panner_1in2out.cc

diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index 30f71032f4d8361a7ca4ff6395cf330722ead3a1..b279914f94ebde690c9bc21bc07f09afecab991d 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.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 "ardour/pannable.h"
 #include "ardour/profile.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "panner_1in2out.h"
 
 #include "pbd/mathfix.h"
@@ -78,7 +76,7 @@ Panner1in2out::Panner1in2out (boost::shared_ptr<Pannable> p)
 {
         if (!Profile->get_trx () ) {
             if (!_pannable->has_state ()) {
-                _pannable->pan_azimuth_control->set_value (0.5);
+                   _pannable->pan_azimuth_control->set_value (0.5, Controllable::NoGroup);
             }
         }
 
@@ -114,7 +112,7 @@ void
 Panner1in2out::set_position (double p)
 {
         if (clamp_position (p)) {
-                _pannable->pan_azimuth_control->set_value (p);
+               _pannable->pan_azimuth_control->set_value (p, Controllable::NoGroup);
         }
 }
 
@@ -157,7 +155,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
        if (fabsf ((delta = (left - desired_left))) > 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;
@@ -212,7 +210,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
        if (fabsf ((delta = (right - desired_right))) > 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;
@@ -243,7 +241,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
                        if (pan != 0.0f) {
 
                                /* pan is not 1 but also not 0, so we must do it "properly" */
-                               
+
                                mix_buffers_with_gain(dst,src,nframes,pan);
 
                                /* XXX it would be nice to mark the buffer as written to */
@@ -252,7 +250,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
                } else {
 
                        /* pan is 1 so we can just copy the input samples straight in */
-                       
+
                        mix_buffers_no_gain(dst,src,nframes);
 
                        /* XXX it would be nice to mark the buffer as written to */
@@ -263,7 +261,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 
 void
 Panner1in2out::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);
@@ -338,9 +336,9 @@ XMLNode&
 Panner1in2out::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;
 }
 
@@ -365,7 +363,7 @@ Panner1in2out::describe_parameter (Evoral::Parameter p)
 }
 
 string
-Panner1in2out::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+Panner1in2out::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
         /* DO NOT USE LocaleGuard HERE */
         double val = ac->get_value();