summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc/osc_select_observer.cc
diff options
context:
space:
mode:
authorLen Ovens <len@ovenwerks.net>2016-11-27 18:32:50 -0800
committerLen Ovens <len@ovenwerks.net>2016-11-27 18:32:50 -0800
commit8ddeca133bb6decbb1f2f46ec7b50c1bb622f731 (patch)
treea6179688988308f21e6e6403cf2fd0b888a7f4ea /libs/surfaces/osc/osc_select_observer.cc
parent198b8f6b58e2b2125932b6f9f4ab0d90677de874 (diff)
OSC: Squelch select feedback when no feedback is configured.
Diffstat (limited to 'libs/surfaces/osc/osc_select_observer.cc')
-rw-r--r--libs/surfaces/osc/osc_select_observer.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc
index b115d4a8c3..ab768bc814 100644
--- a/libs/surfaces/osc/osc_select_observer.cc
+++ b/libs/surfaces/osc/osc_select_observer.cc
@@ -179,11 +179,10 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
OSCSelectObserver::~OSCSelectObserver ()
{
-
strip_connections.drop_connections ();
// all strip buttons should be off and faders 0 and etc.
- clear_strip ("/select/expand", 0);
if (feedback[0]) { // buttons are separate feedback
+ clear_strip ("/select/expand", 0);
text_message ("/select/name", " ");
text_message ("/select/comment", " ");
clear_strip ("/select/mute", 0);
@@ -634,8 +633,12 @@ 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);
+ if (_strip->eq_hpf_controllable ()) {
+ clear_strip ("/select/eq_hpf", 0);
+ }
+ if (_strip->eq_enable_controllable ()) {
+ clear_strip ("/select/eq_enable", 0);
+ }
for (uint32_t i = 1; i <= _strip->eq_band_cnt (); i++) {
text_with_id ("/select/eq_band_name", i, " ");