diff options
| author | Len Ovens <len@ovenwerks.net> | 2016-06-16 16:07:09 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2016-06-16 16:07:09 -0700 |
| commit | 3754859f2f2614131d6c7051be6793623e695412 (patch) | |
| tree | 92d5c43ad32aabe1ab8b9676570c3778aa9cd019 /libs | |
| parent | a9c09af816b3d7da40221ac4a2bb4c6074708d89 (diff) | |
OSC: Blank some more feedback values when select observer is destroyed.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_select_observer.cc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 80b79c9be2..948e73652d 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -2393,7 +2393,7 @@ OSC::periodic (void) recalcbanks (); } } - + for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end(); x++) { OSCGlobalObserver* go; diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 8836de3792..c152630aed 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -133,9 +133,12 @@ OSCSelectObserver::~OSCSelectObserver () if (feedback[0]) { // buttons are separate feedback lo_message msg = lo_message_new (); // name is a string do it first - string path = "/select/name"; lo_message_add_string (msg, " "); - lo_send_message (addr, path.c_str(), msg); + lo_send_message (addr, "/select/name", msg); + lo_message_free (msg); + msg = lo_message_new (); + lo_message_add_string (msg, " "); + lo_send_message (addr, "/select/comment", msg); lo_message_free (msg); clear_strip ("/select/mute", 0); clear_strip ("/select/solo", 0); @@ -144,6 +147,8 @@ OSCSelectObserver::~OSCSelectObserver () clear_strip ("/select/monitor_input", 0); clear_strip ("/select/monitor_disk", 0); clear_strip ("/select/polarity", 0); + clear_strip ("/select/n_inputs", 0); + clear_strip ("/select/n_outputs", 0); } if (feedback[1]) { // level controls if (gainmode) { |