Add PanControllable::get_user_string() (provide indirect access to Panner::value_as_s...

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 20a07c092a3f63f58408a4c528d2b6cb353ce6d5..a85963babebcb04b028879aeab91ac204acdaa25 100644 (file)
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -79,7 +79,7 @@ public:
                return _gain_control;
        }
 
-       std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
 private:
        bool   _denormal_protection;

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 5f9f7d2b91165d271145023178ad871aa85e1f80..ae2c8dd41f669e282af5f19d70dfe3b570bd2768 100644 (file)
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -69,7 +69,7 @@ public:
        virtual void transport_stopped (framepos_t now);
 
        virtual std::string describe_parameter(Evoral::Parameter param);
-       virtual std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       virtual std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        AutoState get_parameter_automation_state (Evoral::Parameter param);
        virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);

diff --git a/libs/ardour/ardour/pan_controllable.h b/libs/ardour/ardour/pan_controllable.h
index 26f0707ff7d7c6147d0ca196ff830dbd290616ae..82aa60fe106afd5fdc79aa052970c8a42f2ff6a9 100644 (file)
--- a/libs/ardour/ardour/pan_controllable.h
+++ b/libs/ardour/ardour/pan_controllable.h
@@ -47,6 +47,7 @@ class LIBARDOUR_API PanControllable : public AutomationControl
        {}
 
        double lower () const;
+       std::string get_user_string () const;
 
   private:
        Pannable* owner;

diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h
index 62c9cd123b4d6f1a99a334d7adb40fb43369f68e..fd8ffe6c28b28e3a4f50b17e76dc030bea975ac5 100644 (file)
--- a/libs/ardour/ardour/pannable.h
+++ b/libs/ardour/ardour/pannable.h
@@ -68,7 +68,7 @@ class LIBARDOUR_API Pannable : public PBD::Stateful, public Automatable, public
                return ((_auto_state & Write) || ((_auto_state & Touch) && touching()));
        }
 
-       std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        void start_touch (double when);
        void stop_touch (bool mark, double when);

diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 1838fb5f56b807c97227b6fa767f291af1b8b25b..48f9ee16e9fc3b0312e20daf4948d9ac8b40ade9 100644 (file)
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -110,7 +110,7 @@ public:
 
        virtual std::set<Evoral::Parameter> what_can_be_automated() const;
        virtual std::string describe_parameter (Evoral::Parameter);
-       virtual std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       virtual std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        bool touching() const;
 

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 967957d854079771a142ec4a14d86908195333fc..2d6b8ee1b8b5c60d15aa40ef556489425b3589b8 100644 (file)
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -77,7 +77,7 @@ class LIBARDOUR_API Send : public Delivery
 
        bool set_name (const std::string& str);
 
-       std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        static uint32_t how_many_sends();
        static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&, bool);

diff --git a/libs/ardour/pan_controllable.cc b/libs/ardour/pan_controllable.cc
index 624f397b7762771c09cabeeb39dbe74ad33aad1d..89842b124b26be5c8a1dc2321ca82e9c49160fb7 100644 (file)
--- a/libs/ardour/pan_controllable.cc
+++ b/libs/ardour/pan_controllable.cc
@@ -66,3 +66,8 @@ PanControllable::actually_set_value (double v, Controllable::GroupControlDisposi
         }
 }
 
+std::string
+PanControllable::get_user_string () const
+{
+       return owner->value_as_string (shared_from_this());
+}

diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index b522d6505444ebec85f8ddc4dd6ff98924d12ee7..0c04c022d2be6f604ccb311638447b877047bf49 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.cc
@@ -363,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();

diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h
index 912072096bd282806b10714d4404b151e923f5e8..06d68a706fba688a26b00050ead19d65352d300e 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.h
+++ b/libs/panners/1in2out/panner_1in2out.h
@@ -56,7 +56,7 @@ class Panner1in2out : public Panner
         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<AutomationControl>) const;
+        std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        XMLNode& get_state ();
 

diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc
index d8a7428c4c02c13dbbb6d09aac1c931caaa3936a..c4cdf22958f3c4df6883502a80abaf6c877ae387 100644 (file)
--- a/libs/panners/2in2out/panner_2in2out.cc
+++ b/libs/panners/2in2out/panner_2in2out.cc
@@ -508,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();

diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h
index bc81234eda79d4e572ea39b7a81171e41089e346..4c71a27c183955456f98dba41ec3a9eb2c71265a 100644 (file)
--- a/libs/panners/2in2out/panner_2in2out.h
+++ b/libs/panners/2in2out/panner_2in2out.h
@@ -63,7 +63,7 @@ class Panner2in2out : public Panner
        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<AutomationControl>) const;
+        std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        XMLNode& get_state ();
 

diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc
index b2efb0f1507a2547d793b159fb8a710c426bbb23..6e4752bff7129ccaa5430ed349db9e251105d529 100644 (file)
--- a/libs/panners/stereobalance/panner_balance.cc
+++ b/libs/panners/stereobalance/panner_balance.cc
@@ -296,7 +296,7 @@ Pannerbalance::describe_parameter (Evoral::Parameter p)
 }
 
 string
-Pannerbalance::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+Pannerbalance::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
        /* DO NOT USE LocaleGuard HERE */
        double val = ac->get_value();

diff --git a/libs/panners/stereobalance/panner_balance.h b/libs/panners/stereobalance/panner_balance.h
index f3813408882909e4f729b777496e3cbb0df41c9d..dabb1da8a52ec103aa2ab196c890a56f38a221a1 100644 (file)
--- a/libs/panners/stereobalance/panner_balance.h
+++ b/libs/panners/stereobalance/panner_balance.h
@@ -57,7 +57,7 @@ class Pannerbalance : public Panner
        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<AutomationControl>) const;
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        XMLNode& get_state ();
 

diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index df34ddd5143710dd63fa9ebd0992df2ae6b828a4..74fcde33aa5ff3a21c3cbf2aaa578c403e241fc0 100644 (file)
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -420,7 +420,7 @@ VBAPanner::describe_parameter (Evoral::Parameter p)
 }
 
 string
-VBAPanner::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+VBAPanner::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
         /* DO NOT USE LocaleGuard HERE */
         double val = ac->get_value();

diff --git a/libs/panners/vbap/vbap.h b/libs/panners/vbap/vbap.h
index ab3c2a6fd2f2db95558c735d90e368c8257f0c13..993bbda9d294db0d457b2ca17e853b83a37491b1 100644 (file)
--- a/libs/panners/vbap/vbap.h
+++ b/libs/panners/vbap/vbap.h
@@ -57,7 +57,7 @@ public:
        void set_azimuth_elevation (double azimuth, double elevation);
 
         std::string describe_parameter (Evoral::Parameter);
-        std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
+        std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        XMLNode& get_state ();