OSC: Add /strip/fader/touch

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 2553499ad15c9c55efc8486895cd943f450a11c4..ff9e8aaf90ae4eeea612c650e6b1af9fff0000d4 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -862,6 +862,10 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
        if (strstr (path, "/automation")) {
                ret = set_automation (path, argv, argc, msg);
 
+       } else
+       if (strstr (path, "/touch")) {
+               ret = touch_detect (path, argv, argc, msg);
+
        } else
        if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) {
                current_value_query (path, len, argv, argc, msg);
@@ -2207,24 +2211,22 @@ OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg)
        uint32_t ctr = 0;
        uint32_t aut = 0;
 
+       if (argc) {
+               if (argv[argc - 1]->f) {
+                       aut = (int)argv[argc - 1]->f;
+               } else {
+                       aut = argv[argc - 1]->i;
+               }
+       }
+
        //parse path first to find stripable
        if (!strncmp (path, "/strip/", 7)) {
                // find ssid and stripable
                if (argc > 1) {
                        strp = get_strip (argv[0]->i, get_address (msg));
-                       if (argv[1]->f) {
-                               aut = (int)argv[1]->f;
-                       } else {
-                               aut = argv[1]->i;
-                       }
                } else {
                        uint32_t ssid = atoi (&(strrchr (path, '/' ))[1]);
                        strp = get_strip (ssid, get_address (msg));
-                       if (argv[0]->f) {
-                               aut = (int)argv[0]->f;
-                       } else {
-                               aut = argv[0]->i;
-                       }
                }
                ctr = 7;
        } else if (!strncmp (path, "/select/", 8)) {
@@ -2233,11 +2235,6 @@ OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg)
                } else {
                        strp = ControlProtocol::first_selected_stripable();
                }
-               if (argv[0]->f) {
-                       aut = (int)argv[0]->f;
-               } else {
-                       aut = argv[0]->i;
-               }
                ctr = 8;
        } else {
                return ret;
@@ -2283,6 +2280,75 @@ OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg)
        return ret;
 }
 
+int
+OSC::touch_detect (const char *path, lo_arg **argv, int argc, lo_message msg)
+{
+       if (!session) return -1;
+
+       int ret = 1;
+       OSCSurface *sur = get_surface(get_address (msg));
+       boost::shared_ptr<Stripable> strp = boost::shared_ptr<Stripable>();
+       uint32_t ctr = 0;
+       uint32_t touch = 0;
+
+       if (argc) {
+               if (argv[argc - 1]->f) {
+                       touch = (int)argv[argc - 1]->f;
+               } else {
+                       touch = argv[argc - 1]->i;
+               }
+       }
+
+       //parse path first to find stripable
+       if (!strncmp (path, "/strip/", 7)) {
+               // find ssid and stripable
+               if (argc > 1) {
+                       strp = get_strip (argv[0]->i, get_address (msg));
+               } else {
+                       uint32_t ssid = atoi (&(strrchr (path, '/' ))[1]);
+                       strp = get_strip (ssid, get_address (msg));
+               }
+               ctr = 7;
+       } else if (!strncmp (path, "/select/", 8)) {
+               if (sur->expand_enable && sur->expand) {
+                       strp = get_strip (sur->expand, get_address (msg));
+               } else {
+                       strp = ControlProtocol::first_selected_stripable();
+               }
+               ctr = 8;
+       } else {
+               return ret;
+       }
+       if (strp) {
+               boost::shared_ptr<AutomationControl> control = boost::shared_ptr<AutomationControl>();
+               // other automatable controls can be added by repeating the next 6.5 lines
+               if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) {
+                       if (strp->gain_control ()) {
+                               control = strp->gain_control ();
+                       } else {
+                               PBD::warning << "No fader for this strip" << endmsg;
+                       }
+               } else {
+                       PBD::warning << "Automation not available for " << path << endmsg;
+               }
+
+               if (control) {
+                       if (touch) {
+                               //start touch
+                               if (!control->touching ()) {
+                                       control->start_touch (control->session().transport_frame());
+                               }
+                       } else {
+                               // end touch
+                               control->stop_touch (true, control->session().transport_frame());
+                       }
+
+               }
+       }
+
+       return ret;
+}
+
 int
 OSC::route_mute (int ssid, int yn, lo_message msg)
 {

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index c21ea1dc0a430939efab85fee7b215762f2bc234..b87994c30eff8657ff7c583e81ff959c499a967f 100644 (file)
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -231,6 +231,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
        static int _catchall (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
 
        int set_automation (const char *path, lo_arg **argv, int argc, lo_message msg);
+       int touch_detect (const char *path, lo_arg **argv, int argc, lo_message msg);
 
        int route_get_sends (lo_message msg);
        int route_get_receives(lo_message msg);