diff options
| author | Len Ovens <len@ovenwerks.net> | 2017-11-13 17:18:33 -0800 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2017-11-13 17:19:09 -0800 |
| commit | 18306f3d3771557b2087de803528f8f4258757e4 (patch) | |
| tree | 8edcd4d0036c228211c780a6bf0285d5f69df1e0 /libs/surfaces/osc | |
| parent | a6205cef4007e76358ba96a6eaaadbd1d29ff78e (diff) | |
OSC: only reset cue sends that do not have a new send
Diffstat (limited to 'libs/surfaces/osc')
| -rw-r--r-- | libs/surfaces/osc/osc_cue_observer.cc | 18 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_cue_observer.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/libs/surfaces/osc/osc_cue_observer.cc b/libs/surfaces/osc/osc_cue_observer.cc index 30907a88d7..2777d39fba 100644 --- a/libs/surfaces/osc/osc_cue_observer.cc +++ b/libs/surfaces/osc/osc_cue_observer.cc @@ -64,7 +64,7 @@ OSCCueObserver::clear_observer () tick_enable = false; strip_connections.drop_connections (); - send_end (); + send_end (0); // all strip buttons should be off and faders 0 and etc. _osc.text_message_with_id ("/cue/name", 0, " ", true, addr); _osc.float_message ("/cue/mute", 0, addr); @@ -80,7 +80,7 @@ OSCCueObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip, S strip_connections.drop_connections (); - send_end (); + send_end (new_sends.size ()); _strip = new_strip; _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::clear_observer, this), OSC::instance()); sends = new_sends; @@ -171,13 +171,15 @@ OSCCueObserver::send_init() } void -OSCCueObserver::send_end () +OSCCueObserver::send_end (uint32_t new_size) { send_connections.drop_connections (); - for (uint32_t i = 1; i <= sends.size(); i++) { - _osc.float_message (string_compose ("/cue/send/fader/%1", i), 0, addr); - _osc.float_message (string_compose ("/cue/send/enable/%1", i), 0, addr); - _osc.text_message_with_id ("/cue/send/name", i, " ", true, addr); + if (new_size < sends.size()) { + for (uint32_t i = new_size; i <= sends.size(); i++) { + _osc.float_message (string_compose ("/cue/send/fader/%1", i), 0, addr); + _osc.float_message (string_compose ("/cue/send/enable/%1", i), 0, addr); + _osc.text_message_with_id ("/cue/send/name", i, " ", true, addr); + } } gain_timeout.clear (); _last_gain.clear (); @@ -188,7 +190,7 @@ void OSCCueObserver::send_restart () { tick_enable = false; - send_end(); + send_end(sends.size()); send_init(); tick_enable = true; } diff --git a/libs/surfaces/osc/osc_cue_observer.h b/libs/surfaces/osc/osc_cue_observer.h index 03793b4722..576314e04c 100644 --- a/libs/surfaces/osc/osc_cue_observer.h +++ b/libs/surfaces/osc/osc_cue_observer.h @@ -65,7 +65,7 @@ class OSCCueObserver void send_gain_message (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable, bool force); void send_enabled_message (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc); void send_init (void); - void send_end (void); + void send_end (uint32_t new_sends_size); void send_restart (void); }; |