ardour/livetrax
13
0
Fork 0
Code

OSC: set Automation mode for fader

Browse Source
This commit is contained in:
Len Ovens 2017-05-09 07:49:26 -07:00
parent f4d62a2a8e
commit 56ebea48c0
1 changed files with 57 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -863,8 +863,7 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
len = strlen (path); len = strlen (path);
if (strstr (path, "/automation")) { if (strstr (path, "/automation")) {
set_automation (path, len, argv, argc, msg); ret = set_automation (path, len, argv, argc, msg);
ret = 0;
} else } else
if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) { if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) {
@ -2190,7 +2189,7 @@ OSC::set_automation (const char *path, size_t len, lo_arg **argv, int argc, lo_m
{ {
if (!session) return -1; if (!session) return -1;
int ret = 1;
OSCSurface *sur = get_surface(get_address (msg)); OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> strp = boost::shared_ptr<Stripable>(); boost::shared_ptr<Stripable> strp = boost::shared_ptr<Stripable>();
uint32_t ctr = 0; uint32_t ctr = 0;
@ -2201,11 +2200,19 @@ OSC::set_automation (const char *path, size_t len, lo_arg **argv, int argc, lo_m
// find ssid and stripable // find ssid and stripable
if (argc > 1) { if (argc > 1) {
strp = get_strip (argv[0]->i, get_address (msg)); strp = get_strip (argv[0]->i, get_address (msg));
aut = argv[1]->i; if (argv[1]->f) {
aut = (int)argv[1]->f;
} else {
aut = argv[1]->i;
}
} else { } else {
uint32_t ssid = atoi (&(strrchr (path, '/' ))[1]); uint32_t ssid = atoi (&(strrchr (path, '/' ))[1]);
strp = get_strip (ssid, get_address (msg)); strp = get_strip (ssid, get_address (msg));
aut = argv[0]->i; if (argv[0]->f) {
aut = (int)argv[0]->f;
} else {
aut = argv[0]->i;
}
} }
ctr = 7; ctr = 7;
} else if (!strncmp (path, "/select/", 8)) { } else if (!strncmp (path, "/select/", 8)) {
@ -2214,21 +2221,59 @@ OSC::set_automation (const char *path, size_t len, lo_arg **argv, int argc, lo_m
} else { } else {
strp = ControlProtocol::first_selected_stripable(); strp = ControlProtocol::first_selected_stripable();
} }
aut = argv[0]->i; if (argv[0]->f) {
aut = (int)argv[0]->f;
} else {
aut = argv[0]->i;
}
ctr = 8; ctr = 8;
} else { } else {
return -1; return ret;
} }
if (strp) { if (strp) {
if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) { if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) {
std::cout << "Automation " << strp->name() << "'s gain" << " in mode: " << aut << "\n"; if (strp->gain_control ()) {
} else { switch (aut) {
return -1; case 0:
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Off);
ret = 0;
break;
case 'm':
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Off);
ret = 0;
break;
case 1:
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Play);
ret = 0;
break;
case 'p':
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Play);
ret = 0;
break;
case 2:
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Write);
ret = 0;
break;
case 'w':
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Write);
ret = 0;
break;
case 3:
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Touch);
ret = 0;
break;
case 't':
strp->gain_control()->set_automation_state (ARDOUR::AutoState::Touch);
ret = 0;
break;
default:
break;
}
}
} }
} }
return 0; return ret;
} }
int int