diff options
| author | Robin Gareus <robin@gareus.org> | 2017-05-14 00:16:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-05-14 00:17:11 +0200 |
| commit | 3d26a29e8a2ed1286091fda2dd480bf5bbebe365 (patch) | |
| tree | 2f5157292d2c39fa668ff5d2acafab477b7cb101 /libs/surfaces/osc | |
| parent | 3e2004aa73b4807bd470b3a816b5343a5127d7a7 (diff) | |
Sanitize "well-known" ctrl API
Diffstat (limited to 'libs/surfaces/osc')
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_select_observer.cc | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 634fcc674e..0a412ee7de 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -3706,8 +3706,8 @@ OSC::sel_eq_hpf (float val, lo_message msg) s = _select; } if (s) { - if (s->eq_hpf_controllable()) { - s->eq_hpf_controllable()->set_value (s->eq_hpf_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup); + if (s->filter_freq_controllable(true)) { + s->filter_freq_controllable(true)->set_value (s->filter_freq_controllable(true)->interface_to_internal (val), PBD::Controllable::NoGroup); return 0; } } diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 35d35841d9..151b00b6e0 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -624,10 +624,11 @@ void OSCSelectObserver::eq_init() { // HPF and enable are special case, rest are in bands - if (_strip->eq_hpf_controllable ()) { - _strip->eq_hpf_controllable ()->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf"), _strip->eq_hpf_controllable()), OSC::instance()); - change_message ("/select/eq_hpf", _strip->eq_hpf_controllable()); + if (_strip->filter_freq_controllable (true)) { + _strip->filter_freq_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf"), _strip->filter_freq_controllable (true)), OSC::instance()); + change_message ("/select/eq_hpf", _strip->filter_freq_controllable(true)); } + // TODO LPF and LPF/HPF enable ctrls. if (_strip->eq_enable_controllable ()) { _strip->eq_enable_controllable ()->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/eq_enable"), _strip->eq_enable_controllable()), OSC::instance()); enable_message ("/select/eq_enable", _strip->eq_enable_controllable()); @@ -666,7 +667,7 @@ OSCSelectObserver::eq_end () { //need to check feedback for [13] eq_connections.drop_connections (); - if (_strip->eq_hpf_controllable ()) { + if (_strip->filter_freq_controllable (true)) { send_float ("/select/eq_hpf", 0); } if (_strip->eq_enable_controllable ()) { |