diff options
| author | Len Ovens <len@ovenwerks.net> | 2016-07-20 08:59:06 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2016-07-20 08:59:06 -0700 |
| commit | b502d689e29183595505c1b1180298d2f11158dc (patch) | |
| tree | 51d9cbc9aad6a1b780b592242a640eac7f850fa0 /libs/surfaces/osc/osc_select_observer.cc | |
| parent | 72a91ae2744ec782578d10407e496e7d97b61db5 (diff) | |
OSC: comp mode control text needs to be changed by signal too.
Diffstat (limited to 'libs/surfaces/osc/osc_select_observer.cc')
| -rw-r--r-- | libs/surfaces/osc/osc_select_observer.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 8b07932a11..bd726123ea 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -157,10 +157,8 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address change_message ("/select/comp_speed", _strip->comp_speed_controllable()); } if (_strip->comp_mode_controllable ()) { - _strip->comp_mode_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_mode"), _strip->comp_mode_controllable()), OSC::instance()); - change_message ("/select/comp_mode", _strip->comp_mode_controllable()); - text_message ("/select/comp_mode_name", _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value())); - text_message ("/select/comp_speed_name", _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value())); + _strip->comp_mode_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::comp_mode, this), OSC::instance()); + comp_mode (); } if (_strip->comp_makeup_controllable ()) { _strip->comp_makeup_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_makeup"), _strip->comp_makeup_controllable()), OSC::instance()); @@ -514,6 +512,14 @@ OSCSelectObserver::text_with_id (string path, uint32_t id, string name) } void +OSCSelectObserver::comp_mode () +{ + change_message ("/select/comp_mode", _strip->comp_mode_controllable()); + text_message ("/select/comp_mode_name", _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value())); + text_message ("/select/comp_speed_name", _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value())); +} + +void OSCSelectObserver::eq_init() { // HPF and enable are special case, rest are in bands @@ -557,6 +563,7 @@ OSCSelectObserver::eq_init() void OSCSelectObserver::eq_end () { + //need to check feedback for [13] eq_connections.drop_connections (); clear_strip ("/select/eq_hpf", 0); clear_strip ("/select/eq_enable", 0); |