diff options
author | Len Ovens <len@ovenwerks.net> | 2018-07-06 07:34:44 -0700 |
---|---|---|
committer | Len Ovens <len@ovenwerks.net> | 2018-07-06 07:35:24 -0700 |
commit | c2af992ac7690a1bab281b2245ffadc041b4916e (patch) | |
tree | a411184718faaebf5b5a37ebc2ae59a534c9c8b4 /libs/surfaces | |
parent | fc69b29c885245fff53b5c0f4117b9fbc5de7344 (diff) |
OSC: Use spill instead of collect
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/osc/osc.cc | 12 | ||||
-rw-r--r-- | libs/surfaces/osc/osc.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 9c0e8e7d32..97fd70c51d 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -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; diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 6795ff39ef..2195afe5f1 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -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); |