diff options
-rw-r--r-- | libs/ardour/ardour/amp.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/automatable.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/pan_controllable.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/pannable.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/panner.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/send.h | 2 | ||||
-rw-r--r-- | libs/ardour/pan_controllable.cc | 5 | ||||
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.cc | 2 | ||||
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.h | 2 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.cc | 2 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.h | 2 | ||||
-rw-r--r-- | libs/panners/stereobalance/panner_balance.cc | 2 | ||||
-rw-r--r-- | libs/panners/stereobalance/panner_balance.h | 2 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.cc | 2 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.h | 2 |
15 files changed, 19 insertions, 13 deletions
diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index 20a07c092a..a85963babe 100644 --- 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 5f9f7d2b91..ae2c8dd41f 100644 --- 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 26f0707ff7..82aa60fe10 100644 --- 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 62c9cd123b..fd8ffe6c28 100644 --- 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 1838fb5f56..48f9ee16e9 100644 --- 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 967957d854..2d6b8ee1b8 100644 --- 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 624f397b77..89842b124b 100644 --- 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 b522d65054..0c04c022d2 100644 --- 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 912072096b..06d68a706f 100644 --- 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 d8a7428c4c..c4cdf22958 100644 --- 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 bc81234eda..4c71a27c18 100644 --- 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 b2efb0f150..6e4752bff7 100644 --- 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 f381340888..dabb1da8a5 100644 --- 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 df34ddd514..74fcde33aa 100644 --- 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 ab3c2a6fd2..993bbda9d2 100644 --- 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 (); |