summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc
diff options
context:
space:
mode:
authorLen Ovens <len@ovenwerks.net>2017-08-21 12:09:48 -0700
committerLen Ovens <len@ovenwerks.net>2017-08-21 12:10:27 -0700
commitab621b550d77f83a1f9808776c89765a638d7db1 (patch)
treeffdef83e9a6913504e82a44d641d4d65c3c4b4c7 /libs/surfaces/osc
parentefd72938479df1d6660c893bfccb44dfde1389c4 (diff)
OSC: /cue/enable feedback not changing fixed
Diffstat (limited to 'libs/surfaces/osc')
-rw-r--r--libs/surfaces/osc/osc.cc8
-rw-r--r--libs/surfaces/osc/osc_cue_observer.cc8
-rw-r--r--libs/surfaces/osc/osc_cue_observer.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 6bde293aeb..e581876216 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -5096,23 +5096,23 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo
if (!strncmp (path, "/cue/aux", 8)) {
// set our Aux bus
- ret = cue_set (argv[0]->i, msg);
+ ret = cue_set (argv[0]->f, msg);
}
else if (!strncmp (path, "/cue/connect", 12)) {
// Connect to default Aux bus
- if ((!argc) || argv[0]->i) {
+ if ((!argc) || argv[0]->f) {
ret = cue_set (1, msg);
}
}
else if (!strncmp (path, "/cue/next_aux", 13)) {
// switch to next Aux bus
- if ((!argc) || argv[0]->i) {
+ if ((!argc) || argv[0]->f) {
ret = cue_next (msg);
}
}
else if (!strncmp (path, "/cue/previous_aux", 17)) {
// switch to previous Aux bus
- if ((!argc) || argv[0]->i) {
+ if ((!argc) || argv[0]->f) {
ret = cue_previous (msg);
}
}
diff --git a/libs/surfaces/osc/osc_cue_observer.cc b/libs/surfaces/osc/osc_cue_observer.cc
index b23733f04e..c1eed2921e 100644
--- a/libs/surfaces/osc/osc_cue_observer.cc
+++ b/libs/surfaces/osc/osc_cue_observer.cc
@@ -139,8 +139,8 @@ OSCCueObserver::send_init()
}
boost::shared_ptr<Processor> proc = boost::dynamic_pointer_cast<Processor> (send);
- proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_enabled_message, this, X_("/cue/send/enable"), i + 1, proc->enabled()), OSC::instance());
- send_enabled_message (X_("/cue/send/enable"), i + 1, proc->enabled());
+ proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_enabled_message, this, X_("/cue/send/enable"), i + 1, proc), OSC::instance());
+ send_enabled_message (X_("/cue/send/enable"), i + 1, proc);
}
}
@@ -239,14 +239,14 @@ OSCCueObserver::send_gain_message (uint32_t id, boost::shared_ptr<Controllable>
}
void
-OSCCueObserver::send_enabled_message (std::string path, uint32_t id, bool enabled)
+OSCCueObserver::send_enabled_message (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc)
{
lo_message msg = lo_message_new ();
if (id) {
path = string_compose("%1/%2", path, id);
}
- lo_message_add_float (msg, (float) enabled);
+ lo_message_add_float (msg, (float) proc->enabled());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
diff --git a/libs/surfaces/osc/osc_cue_observer.h b/libs/surfaces/osc/osc_cue_observer.h
index fe318c9d91..eb669ee167 100644
--- a/libs/surfaces/osc/osc_cue_observer.h
+++ b/libs/surfaces/osc/osc_cue_observer.h
@@ -60,7 +60,7 @@ class OSCCueObserver
void send_change_message (std::string path, uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
void text_with_id (std::string path, uint32_t id, std::string val);
void send_gain_message (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
- void send_enabled_message (std::string path, uint32_t id, bool enabled);
+ void send_enabled_message (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc);
void clear_strip (std::string path, float val);
void send_init (void);
void send_end (void);