Remove C++11'ism

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

diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h
index c36e3e87c7636cc096a4931460c5cb5edda33741..0818bdc9182b3cca669d3a21a8f003849c5d4910 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.h
+++ b/libs/panners/1in2out/panner_1in2out.h
@@ -33,6 +33,7 @@
 #include "ardour/types.h"
 #include "ardour/panner.h"
 
+
 namespace ARDOUR {
 
 class Panner1in2out : public Panner
@@ -41,24 +42,25 @@ class Panner1in2out : public Panner
        Panner1in2out (boost::shared_ptr<Pannable>);
        ~Panner1in2out ();
 
-        void set_position (double);
-        bool clamp_position (double&);
+    void set_position (double);
+    bool clamp_position (double&);
+       std::pair<double, double> position_range () const;
+
+       double position() const;
 
-        double position() const;
+       ChanCount in() const { return ChanCount (DataType::AUDIO, 1); }
+       ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
 
-        ChanCount in() const { return ChanCount (DataType::AUDIO, 1); }
-        ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
+       std::set<Evoral::Parameter> what_can_be_automated() const;
 
-        std::set<Evoral::Parameter> what_can_be_automated() const;
+       static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
-        static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
+       std::string describe_parameter (Evoral::Parameter);
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
-        std::string describe_parameter (Evoral::Parameter);
-        std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       XMLNode& get_state ();
 
-       XMLNode& state (bool full_state); 
-       XMLNode& get_state (void); 
-       int      set_state (const XMLNode&, int version);
+       void reset ();
 
   protected:
        float left;
@@ -69,11 +71,11 @@ class Panner1in2out : public Panner
        float right_interp;
 
        void distribute_one (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which);
-        void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
-                                       framepos_t start, framepos_t end, pframes_t nframes,
-                                       pan_t** buffers, uint32_t which);
+       void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
+                                      samplepos_t start, samplepos_t end, pframes_t nframes,
+                                      pan_t** buffers, uint32_t which);
 
-        void update ();
+       void update ();
 };
 
 } // namespace