smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

Pan: remove value-as-string indirection

Browse source
This commit is contained in:
Robin Gareus 2020-03-21 18:20:54 +01:00
parent 991f92c2c6
commit efb63e1bf2
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
5 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/pannable.h
View file

@ -64,7 +64,6 @@ public:
return ((_auto_state & Write) || ((_auto_state & (Touch | Latch)) && touching())); return ((_auto_state & Write) || ((_auto_state & (Touch | Latch)) && touching()));
} }
std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
void start_touch (double when); void start_touch (double when);
void stop_touch (double when); void stop_touch (double when);

5
libs/ardour/ardour/panner.h
View file

@ -57,6 +57,7 @@ class Pannable;
class BufferSet; class BufferSet;
class AudioBuffer; class AudioBuffer;
class Speakers; class Speakers;
class PanControllable;
class LIBARDOUR_API Panner : public PBD::Stateful, public PBD::ScopedConnectionList class LIBARDOUR_API Panner : public PBD::Stateful, public PBD::ScopedConnectionList
{ {
@ -111,7 +112,6 @@ public:
virtual std::set<Evoral::Parameter> what_can_be_automated() const; virtual std::set<Evoral::Parameter> what_can_be_automated() const;
virtual std::string describe_parameter (Evoral::Parameter); virtual std::string describe_parameter (Evoral::Parameter);
virtual std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
bool touching() const; bool touching() const;
@ -145,8 +145,11 @@ public:
virtual void thaw (); virtual void thaw ();
protected: protected:
friend PanControllable;
boost::shared_ptr<Pannable> _pannable; boost::shared_ptr<Pannable> _pannable;
virtual std::string value_as_string (boost::shared_ptr<const AutomationControl>) const = 0;
virtual void distribute_one (AudioBuffer&, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which) = 0; virtual void distribute_one (AudioBuffer&, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which) = 0;
virtual void distribute_one_automated (AudioBuffer&, BufferSet& obufs, virtual void distribute_one_automated (AudioBuffer&, BufferSet& obufs,
samplepos_t start, samplepos_t end, pframes_t nframes, samplepos_t start, samplepos_t end, pframes_t nframes,

4
libs/ardour/pan_controllable.cc
View file

@ -58,12 +58,12 @@ PanControllable::actually_set_value (double v, Controllable::GroupControlDisposi
std::string std::string
PanControllable::get_user_string () const PanControllable::get_user_string () const
{ {
if (!owner) { if (!owner || !owner->panner()) {
/* assume PanAzimuthAutomation, 0..1 */ /* assume PanAzimuthAutomation, 0..1 */
float v = get_value (); float v = get_value ();
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%.0f%%", 100.f * v); snprintf(buf, sizeof(buf), "%.0f%%", 100.f * v);
return buf; return buf;
} }
return owner->value_as_string (boost::dynamic_pointer_cast<const AutomationControl>(shared_from_this())); return owner->panner()->value_as_string (boost::dynamic_pointer_cast<const AutomationControl>(shared_from_this()));
} }

12
libs/ardour/pannable.cc
View file

@ -256,15 +256,3 @@ Pannable::set_state (const XMLNode& root, int version)
return 0; return 0;
} }
string
Pannable::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
{
boost::shared_ptr<Panner> p = panner ();
if (p) {
return p->value_as_string (ac);
}
return ARDOUR::value_as_string(ac->desc(), ac->get_value());
}

6
libs/ardour/panner.cc
View file

@ -98,12 +98,6 @@ Panner::describe_parameter (Evoral::Parameter p)
return _pannable->describe_parameter (p); return _pannable->describe_parameter (p);
} }
string
Panner::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
{
return _pannable->value_as_string (ac);
}
int int
Panner::set_state (XMLNode const &, int) Panner::set_state (XMLNode const &, int)
{ {