diff options
author | Robin Gareus <robin@gareus.org> | 2020-03-21 03:43:21 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2020-03-21 19:46:39 +0100 |
commit | 386264bd235a042d5d46550b04f6bdbdc3aac54b (patch) | |
tree | 0af81b922f1077778063e43384d634ff5cd14cf4 /libs/panners | |
parent | 60bcefd03dc020afd206ce59a38ebb9a569dc3b2 (diff) |
Pan: consolidate what_can_be_automated API
Diffstat (limited to 'libs/panners')
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.cc | 11 | ||||
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.h | 2 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.cc | 11 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.h | 2 | ||||
-rw-r--r-- | libs/panners/stereobalance/panner_balance.cc | 10 | ||||
-rw-r--r-- | libs/panners/stereobalance/panner_balance.h | 2 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.cc | 24 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.h | 2 |
8 files changed, 16 insertions, 48 deletions
diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc index 3e4ebd8d82..dade3286ba 100644 --- a/libs/panners/1in2out/panner_1in2out.cc +++ b/libs/panners/1in2out/panner_1in2out.cc @@ -80,6 +80,8 @@ Panner1in2out::Panner1in2out (boost::shared_ptr<Pannable> p) _pannable->pan_azimuth_control->set_value (0.5, Controllable::NoGroup); } + _can_automate_list.insert (Evoral::Parameter (PanAzimuthAutomation)); + update (); left = desired_left; @@ -342,15 +344,6 @@ Panner1in2out::get_state () return root; } - -std::set<Evoral::Parameter> -Panner1in2out::what_can_be_automated() const -{ - set<Evoral::Parameter> s; - s.insert (Evoral::Parameter (PanAzimuthAutomation)); - return s; -} - string Panner1in2out::value_as_string (boost::shared_ptr<const AutomationControl> ac) const { diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h index 93112e1527..55ec3ffae3 100644 --- a/libs/panners/1in2out/panner_1in2out.h +++ b/libs/panners/1in2out/panner_1in2out.h @@ -52,8 +52,6 @@ class Panner1in2out : public Panner 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; - static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>); std::string value_as_string (boost::shared_ptr<const AutomationControl>) const; diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index da47228fbb..e6127194c4 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -85,6 +85,8 @@ Panner2in2out::Panner2in2out (boost::shared_ptr<Pannable> p) set_width(w > 0 ? wrange : -wrange); } + _can_automate_list.insert (Evoral::Parameter (PanAzimuthAutomation)); + _can_automate_list.insert (Evoral::Parameter (PanWidthAutomation)); update (); @@ -486,15 +488,6 @@ Panner2in2out::get_state () return root; } -std::set<Evoral::Parameter> -Panner2in2out::what_can_be_automated() const -{ - set<Evoral::Parameter> s; - s.insert (Evoral::Parameter (PanAzimuthAutomation)); - s.insert (Evoral::Parameter (PanWidthAutomation)); - return s; -} - string Panner2in2out::value_as_string (boost::shared_ptr<const AutomationControl> ac) const { diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h index f41944a911..4816be7734 100644 --- a/libs/panners/2in2out/panner_2in2out.h +++ b/libs/panners/2in2out/panner_2in2out.h @@ -58,8 +58,6 @@ class Panner2in2out : public Panner double position () const; double width () const; - std::set<Evoral::Parameter> what_can_be_automated() const; - static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>); std::string value_as_string (boost::shared_ptr<const AutomationControl>) const; diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc index 73a3022a12..701f081951 100644 --- a/libs/panners/stereobalance/panner_balance.cc +++ b/libs/panners/stereobalance/panner_balance.cc @@ -77,6 +77,8 @@ Pannerbalance::Pannerbalance (boost::shared_ptr<Pannable> p) _pannable->pan_azimuth_control->set_value (0.5, Controllable::NoGroup); } + _can_automate_list.insert (Evoral::Parameter (PanAzimuthAutomation)); + update (); /* LEFT SIGNAL */ @@ -275,14 +277,6 @@ Pannerbalance::get_state () return root; } -std::set<Evoral::Parameter> -Pannerbalance::what_can_be_automated() const -{ - set<Evoral::Parameter> s; - s.insert (Evoral::Parameter (PanAzimuthAutomation)); - return s; -} - string Pannerbalance::value_as_string (boost::shared_ptr<const AutomationControl> ac) const { diff --git a/libs/panners/stereobalance/panner_balance.h b/libs/panners/stereobalance/panner_balance.h index db41502cbc..9ce5519759 100644 --- a/libs/panners/stereobalance/panner_balance.h +++ b/libs/panners/stereobalance/panner_balance.h @@ -50,8 +50,6 @@ class Pannerbalance : public Panner std::pair<double, double> position_range () const; double position () const; - std::set<Evoral::Parameter> what_can_be_automated() const; - static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>); std::string value_as_string (boost::shared_ptr<const AutomationControl>) const; diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index da48b46fa0..0bf9e34255 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -123,6 +123,16 @@ VBAPanner::configure_io (ChanCount in, ChanCount /* ignored - we use Speakers */ void VBAPanner::update () { + + _can_automate_list.clear (); + _can_automate_list.insert (Evoral::Parameter (PanAzimuthAutomation)); + if (_signals.size() > 1) { + _can_automate_list.insert (Evoral::Parameter (PanWidthAutomation)); + } + if (_speakers->dimension() == 3) { + _can_automate_list.insert (Evoral::Parameter (PanElevationAutomation)); + } + /* recompute signal directions based on panner azimuth and, if relevant, width (diffusion) and elevation parameters */ double elevation = _pannable->pan_elevation_control->get_value() * 90.0; @@ -392,20 +402,6 @@ VBAPanner::out() const return ChanCount (DataType::AUDIO, _speakers->n_speakers()); } -std::set<Evoral::Parameter> -VBAPanner::what_can_be_automated() const -{ - set<Evoral::Parameter> s; - s.insert (Evoral::Parameter (PanAzimuthAutomation)); - if (_signals.size() > 1) { - s.insert (Evoral::Parameter (PanWidthAutomation)); - } - if (_speakers->dimension() == 3) { - s.insert (Evoral::Parameter (PanElevationAutomation)); - } - return s; -} - string VBAPanner::value_as_string (boost::shared_ptr<const AutomationControl> ac) const { diff --git a/libs/panners/vbap/vbap.h b/libs/panners/vbap/vbap.h index fb96de8715..2a3c0ea8e3 100644 --- a/libs/panners/vbap/vbap.h +++ b/libs/panners/vbap/vbap.h @@ -49,8 +49,6 @@ public: void set_width (double); void set_elevation (double); - std::set<Evoral::Parameter> what_can_be_automated() const; - static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>); void distribute (BufferSet& ibufs, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes); |