ardour/livetrax
13
0
Fork 0
Code

OSC: Use spill instead of collect

Browse Source
This commit is contained in:
Len Ovens 2018-07-06 07:34:44 -07:00
parent fc69b29c88
commit c2af992ac7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -835,8 +835,8 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
ret = touch_detect (path, types, argv, argc, msg);
} else
if (strstr (path, X_("/collect"))) {
ret = collect (path, types, argv, argc, msg);
if (strstr (path, X_("/spill"))) {
ret = spill (path, types, argv, argc, msg);
} else
if (len >= 17 && !strcmp (&path[len-15], X_("/#current_value"))) {
@ -3942,12 +3942,12 @@ OSC::fake_touch (boost::shared_ptr<ARDOUR::AutomationControl> ctrl)
}
int
OSC::collect (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
OSC::spill (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
{
/*
* collect should have the form of:
* /select/collect (may have i or f keypress/release)
* /strip/collect i (may have keypress and i may be inline)
* spill should have the form of:
* /select/spill (may have i or f keypress/release)
* /strip/spill i (may have keypress and i may be inline)
*/
if (!session || argc > 1) return -1;

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

@ -327,7 +327,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
int touch_detect (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg);
int fake_touch (boost::shared_ptr<ARDOUR::AutomationControl> ctrl);
int collect (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg);
int spill (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg);
int route_get_sends (lo_message msg);
int route_get_receives(lo_message msg);