OSC: Add Automation mode feedback to /strip

diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc
index dc7677c33171e2a3865a60f06fc0eabcfacbdfeb..beea83f84f7b053a114946e55eeb352ca245d691 100644 (file)
--- a/libs/surfaces/osc/osc_route_observer.cc
+++ b/libs/surfaces/osc/osc_route_observer.cc
@@ -75,12 +75,15 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, lo_address a
        }
 
        if (feedback[1]) { // level controls
+               boost::shared_ptr<GainControl> gain_cont = _strip->gain_control();
                if (gainmode) {
-                       _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), _strip->gain_control()), OSC::instance());
-                       send_gain_message ("/strip/fader", _strip->gain_control());
+                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::gain_automation, this, X_("/strip/fader")), OSC::instance());
+                       gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), gain_cont), OSC::instance());
+                       gain_automation ("/strip/fader");
                } else {
-                       _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), _strip->gain_control()), OSC::instance());
-                       send_gain_message ("/strip/gain", _strip->gain_control());
+                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::gain_automation, this, X_("/strip/gain")), OSC::instance());
+                       gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), gain_cont), OSC::instance());
+                       gain_automation ("/strip/gain");
                }
 
                boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
@@ -358,6 +361,27 @@ OSCRouteObserver::send_gain_message (string path, boost::shared_ptr<Controllable
        lo_message_free (msg);
 }
 
+void
+OSCRouteObserver::gain_automation (string path)
+{
+       lo_message msg = lo_message_new ();
+       string apath = string_compose ("%1/automation", path);
+
+       if (feedback[2]) {
+               apath = set_path (apath);
+       } else {
+               lo_message_add_int32 (msg, ssid);
+       }
+
+       boost::shared_ptr<GainControl> control = _strip->gain_control();
+       lo_message_add_float (msg, control->alist()->automation_state());
+       send_gain_message (path, control);
+       lo_send_message (addr, apath.c_str(), msg);
+       lo_message_free (msg);
+}
+       
+
+
 string
 OSCRouteObserver::set_path (string path)
 {

diff --git a/libs/surfaces/osc/osc_route_observer.h b/libs/surfaces/osc/osc_route_observer.h
index ef9bfb7ba2cf52d8e1e458240a5e5001092261d8..a445334b3cd70593743e9dc2d1287979c9e516fc 100644 (file)
--- a/libs/surfaces/osc/osc_route_observer.h
+++ b/libs/surfaces/osc/osc_route_observer.h
@@ -65,6 +65,7 @@ class OSCRouteObserver
        void text_with_id (std::string path, uint32_t id, std::string name);
        void send_monitor_status (boost::shared_ptr<PBD::Controllable> controllable);
        void send_gain_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
+       void gain_automation (std::string path);
        void send_trim_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
        std::string set_path (std::string path);
        void clear_strip (std::string path, float val);