ardour/livetrax
13
0
Fork 0
Code

OSC: allow personal monitor to add a send.

Browse Source
This commit is contained in:
Len Ovens 2018-10-13 11:02:47 -07:00
parent 931fcdcfb6
commit b35283caa1
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/surfaces/osc/osc.cc
View File

@ -6393,6 +6393,16 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo
PBD::warning << "OSC: new_aux has wrong number or type of parameters." << endmsg; PBD::warning << "OSC: new_aux has wrong number or type of parameters." << endmsg;
} }
} }
else if (!strncmp (path, X_("/cue/new_send"), 13)) {
// Create new send to aux
string rt_name = "";
if (argc == 1 && types[0] == 's') {
rt_name = &argv[0]->s;
ret = cue_new_send (rt_name, msg);
} else {
PBD::warning << "OSC: new_send has wrong number or type of parameters." << endmsg;
}
}
else if (!strncmp (path, X_("/cue/next_aux"), 13)) { else if (!strncmp (path, X_("/cue/next_aux"), 13)) {
// switch to next Aux bus // switch to next Aux bus
if ((!argc) || argv[0]->f || argv[0]->i) { if ((!argc) || argv[0]->f || argv[0]->i) {
@ -6517,6 +6527,38 @@ OSC::cue_new_aux (string name, string dest, lo_message msg)
return -1; return -1;
} }
int
OSC::cue_new_send (string rt_name, 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) {
boost::shared_ptr<Route> rt_send = session->route_by_name (rt_name);
if (rt_send && (aux != rt_send)) {
// make sure there isn't one already
bool s_only = true;
if (!rt_send->feeds (aux, &s_only)) {
// create send
boost::shared_ptr<Processor> loc = rt_send->before_processor_for_placement (PreFader);
rt_send->add_aux_send (aux, loc);
session->dirty ();
return 0;
} else {
PBD::warning << "OSC: new_send - duplicate send, ignored." << endmsg;
}
} else {
PBD::warning << "OSC: new_send - route doesn't exist or is aux." << endmsg;
}
} else {
PBD::warning << "OSC: new_send - No Aux to send to." << endmsg;
}
} else {
PBD::warning << "OSC: new_send - monitoring not set, select aux first." << endmsg;
}
return 1;
}
int int
OSC::cue_connect_aux (std::string dest, lo_message msg) OSC::cue_connect_aux (std::string dest, lo_message msg)
{ {

1
libs/surfaces/osc/osc.h
View File

@ -344,6 +344,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
int cue_set (uint32_t aux, lo_message msg); int cue_set (uint32_t aux, lo_message msg);
int _cue_set (uint32_t aux, lo_address addr); int _cue_set (uint32_t aux, lo_address addr);
int cue_new_aux (std::string name, std::string dest, lo_message msg); int cue_new_aux (std::string name, std::string dest, 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_connect_aux (std::string dest, lo_message msg);
int cue_next (lo_message msg); int cue_next (lo_message msg);
int cue_previous (lo_message msg); int cue_previous (lo_message msg);