summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc
diff options
context:
space:
mode:
authorLen Ovens <len@ovenwerks.net>2018-11-07 18:21:40 -0800
committerLen Ovens <len@ovenwerks.net>2018-11-12 22:30:32 -0800
commite9013c0f99a3f16097800276241e8363fda33e8f (patch)
treebbeefd8c3b9154eb772015136d93cf9f83147bbb /libs/surfaces/osc
parent1b2b3452cba03e47b2331aa2f6056c629e30487d (diff)
OSC: New personal monitor buses no longer need to be hidden
Diffstat (limited to 'libs/surfaces/osc')
-rw-r--r--libs/surfaces/osc/osc.cc28
-rw-r--r--libs/surfaces/osc/osc.h1
2 files changed, 0 insertions, 29 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index da3c5ff169..24b7e76e43 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -6464,12 +6464,6 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo
PBD::warning << "OSC: new_send has wrong number or type of parameters." << endmsg;
}
}
- else if (!strncmp (path, X_("/cue/hide_aux"), 13)) {
- // hide our Aux bus
- if (argc) {
- ret = cue_hide (value, msg);
- }
- }
else if (!strncmp (path, X_("/cue/next_aux"), 13)) {
// switch to next Aux bus
if ((!argc) || argv[0]->f || argv[0]->i) {
@@ -6593,8 +6587,6 @@ OSC::cue_new_aux (string name, string dest_1, string dest_2, lo_message msg)
r->output ()->connect (*(ports.begin()), dest_1, this);
r->output ()->connect (*(i), dest_2, this);
}
- aux->presentation_info().set_hidden (true);
-
cue_set ((uint32_t) -1, msg);
session->set_dirty();
return 0;
@@ -6635,26 +6627,6 @@ OSC::cue_new_send (string rt_name, lo_message msg)
}
int
-OSC::cue_hide (float state, lo_message msg)
-{
- OSCSurface *sur = get_surface(get_address (msg), true);
- if (sur->cue) {
- boost::shared_ptr<Route> aux = boost::dynamic_pointer_cast<Route> (get_strip (sur->aux, get_address(msg)));
- if (aux) {
- if (aux->is_hidden () != (bool) state) {
- aux->presentation_info().set_hidden ((bool) state);
- }
- return 0;
- } else {
- PBD::warning << "OSC: hide_aux - No Aux found." << endmsg;
- }
- } else {
- PBD::warning << "OSC: hide_aux - monitoring not set, select aux first." << endmsg;
- }
- return 1;
-}
-
-int
OSC::cue_connect_aux (std::string dest, lo_message msg)
{
OSCSurface *sur = get_surface(get_address (msg), true);
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 66d05bb51a..1f4382ae0a 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -346,7 +346,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
int cue_new_aux (std::string name, std::string dest_1, std::string dest_2, lo_message msg);
int cue_new_send (std::string rt_name, lo_message msg);
int cue_connect_aux (std::string dest, lo_message msg);
- int cue_hide (float state, lo_message msg);
int cue_next (lo_message msg);
int cue_previous (lo_message msg);
int cue_send_fader (uint32_t id, float position, lo_message msg);