OSC: add /strip/hide
[ardour.git] / libs / surfaces / osc / osc_select_observer.cc
index edd3baab2f45c54c3a612e45572c106ee0ce6dcc..d08c454b26df2ad7d6a5c59d1944a99b8d750600 100644 (file)
@@ -20,6 +20,8 @@
 #include <vector>
 #include "boost/lambda/lambda.hpp"
 
+#include "pbd/control_math.h"
+
 #include "ardour/session.h"
 #include "ardour/track.h"
 #include "ardour/monitor_control.h"
 #include "ardour/solo_safe_control.h"
 #include "ardour/route.h"
 #include "ardour/send.h"
+#include "ardour/plugin.h"
+#include "ardour/plugin_insert.h"
 #include "ardour/processor.h"
+#include "ardour/readonly_control.h"
 
 #include "osc.h"
 #include "osc_select_observer.h"
@@ -44,272 +49,509 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace ArdourSurface;
 
-OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address a, uint32_t gm, std::bitset<32> fb)
-       : _strip (s)
-       ,gainmode (gm)
-       ,feedback (fb)
+OSCSelectObserver::OSCSelectObserver (OSC& o, ArdourSurface::OSC::OSCSurface* su)
+       : _osc (o)
+       ,sur (su)
        ,nsends (0)
-       ,_last_gain (0.0)
+       ,_last_gain (-1.0)
+       ,_last_trim (-1.0)
+       ,_init (true)
+       ,eq_bands (0)
+       ,_expand (2048)
 {
-       addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
+       addr = lo_address_new_from_url  (sur->remote_url.c_str());
+       gainmode = sur->gainmode;
+       feedback = sur->feedback;
+       in_line = feedback[2];
+       send_page_size = sur->send_page_size;
+       send_size = send_page_size;
+       send_page = sur->send_page;
+       plug_page_size = sur->plug_page_size;
+       plug_size = plug_page_size;
+       plug_page = sur->plug_page;
+       if (sur->plugins.size () > 0) {
+               plug_id = sur->plugins[sur->plugin_id - 1];
+       } else {
+               plug_id = -1;
+       }
+       refresh_strip (sur->select, sur->nsends, gainmode, true);
+       set_expand (sur->expand_enable);
+}
+
+OSCSelectObserver::~OSCSelectObserver ()
+{
+       _init = true;
+       no_strip ();
+       lo_address_free (addr);
+}
+
+void
+OSCSelectObserver::no_strip ()
+{
+       // This gets called on drop references
+       _init = true;
+
+       strip_connections.drop_connections ();
+       send_connections.drop_connections ();
+       plugin_connections.drop_connections ();
+       eq_connections.drop_connections ();
+       /*
+        * The strip will sit idle at this point doing nothing until
+        * the surface has recalculated it's strip list and then calls
+        * refresh_strip. Otherwise refresh strip will get a strip address
+        * that does not exist... Crash
+        */
+ }
+
+void
+OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip, uint32_t s_nsends, uint32_t gm, bool force)
+{
+       _init = true;
+       if (_tick_busy) {
+               Glib::usleep(100); // let tick finish
+       }
+       gainmode = gm;
+
+       if (_strip && (new_strip == _strip) && !force) {
+               _init = false;
+               return;
+       }
+
+       _strip = new_strip;
+       if (!_strip) {
+               clear_observer ();
+               return;
+       }
+
+       _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::no_strip, this), OSC::instance());
        as = ARDOUR::Off;
+       _comp_redux = 1;
+       nsends = s_nsends;
+       _last_gain = -1.0;
+       _last_trim = -1.0;
 
-       if (feedback[0]) { // buttons are separate feedback
-               _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance());
-               name_changed (ARDOUR::Properties::name);
+       _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance());
+       name_changed (ARDOUR::Properties::name);
 
-               _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/mute"), _strip->mute_control()), OSC::instance());
-               change_message ("/select/mute", _strip->mute_control());
+       _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::pi_changed, this, _1), OSC::instance());
+       _osc.float_message ("/select/hide", _strip->is_hidden (), addr);
 
-               _strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo"), _strip->solo_control()), OSC::instance());
-               change_message ("/select/solo", _strip->solo_control());
+       _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/mute"), _strip->mute_control()), OSC::instance());
+       change_message ("/select/mute", _strip->mute_control());
 
-               if (_strip->solo_isolate_control()) {
-                       _strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
-                       change_message ("/select/solo_iso", _strip->solo_isolate_control());
-               }
+       _strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo"), _strip->solo_control()), OSC::instance());
+       change_message ("/select/solo", _strip->solo_control());
 
-               if (_strip->solo_safe_control()) {
-                       _strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_safe"), _strip->solo_safe_control()), OSC::instance());
-                       change_message ("/select/solo_safe", _strip->solo_safe_control());
-               }
+       if (_strip->solo_isolate_control()) {
+               _strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
+               change_message ("/select/solo_iso", _strip->solo_isolate_control());
+       }
 
-               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
-               if (track) {
-                       track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::monitor_status, this, track->monitoring_control()), OSC::instance());
-                       monitor_status (track->monitoring_control());
-               }
+       if (_strip->solo_safe_control()) {
+               _strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_safe"), _strip->solo_safe_control()), OSC::instance());
+               change_message ("/select/solo_safe", _strip->solo_safe_control());
+       }
 
-               boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
-               if (rec_controllable) {
-                       rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/recenable"), _strip->rec_enable_control()), OSC::instance());
-                       change_message ("/select/recenable", _strip->rec_enable_control());
-               }
+       boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
+       if (track) {
+               track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::monitor_status, this, track->monitoring_control()), OSC::instance());
+               monitor_status (track->monitoring_control());
+       }
 
-               boost::shared_ptr<AutomationControl> recsafe_controllable = _strip->rec_safe_control ();
-               if (recsafe_controllable) {
-                       recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/record_safe"), _strip->rec_safe_control()), OSC::instance());
-                       change_message ("/select/record_safe", _strip->rec_safe_control());
-               }
+       boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
+       if (rec_controllable) {
+               rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/recenable"), _strip->rec_enable_control()), OSC::instance());
+               change_message ("/select/recenable", _strip->rec_enable_control());
+       }
 
-               boost::shared_ptr<AutomationControl> phase_controllable = _strip->phase_control ();
-               if (phase_controllable) {
-                       phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/polarity"), _strip->phase_control()), OSC::instance());
-                       change_message ("/select/polarity", _strip->phase_control());
-               }
+       boost::shared_ptr<AutomationControl> recsafe_controllable = _strip->rec_safe_control ();
+       if (recsafe_controllable) {
+               recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/record_safe"), _strip->rec_safe_control()), OSC::instance());
+               change_message ("/select/record_safe", _strip->rec_safe_control());
+       }
 
+       boost::shared_ptr<AutomationControl> phase_controllable = _strip->phase_control ();
+       if (phase_controllable) {
+               phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/polarity"), _strip->phase_control()), OSC::instance());
+               change_message ("/select/polarity", _strip->phase_control());
        }
 
-       if (feedback[1]) { // level controls
-               boost::shared_ptr<GainControl> gain_cont = _strip->gain_control();
-               if (gainmode) {
-                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCSelectObserver::gain_automation, this, X_("/select/fader")), OSC::instance());
-                       gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this, X_("/select/fader"), gain_cont), OSC::instance());
-                       gain_automation ("/select/fader");
-               } else {
-                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCSelectObserver::gain_automation, this, X_("/select/gain")), OSC::instance());
-                       gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this, X_("/select/gain"), _strip->gain_control()), OSC::instance());
-                       gain_automation ("/strip/gain");
-               }
+       _strip->gain_control()->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_automation, this), OSC::instance());
+       _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this), OSC::instance());
+       gain_automation ();
 
-               boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
-               if (trim_controllable) {
-                       trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::trim_message, this, X_("/select/trimdB"), _strip->trim_control()), OSC::instance());
-                       trim_message ("/select/trimdB", _strip->trim_control());
-               }
+       boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
+       if (trim_controllable) {
+               trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::trim_message, this, X_("/select/trimdB"), _strip->trim_control()), OSC::instance());
+               trim_message ("/select/trimdB", _strip->trim_control());
+       }
 
-               boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
-               if (pan_controllable) {
-                       pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance());
-                       change_message ("/select/pan_stereo_position", _strip->pan_azimuth_control());
-               }
+       boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
+       if (pan_controllable) {
+               pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance());
+               change_message ("/select/pan_stereo_position", _strip->pan_azimuth_control());
+       }
 
-               boost::shared_ptr<Controllable> width_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_width_control());
-               if (width_controllable) {
-                       width_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_width"), _strip->pan_width_control()), OSC::instance());
-                       change_message ("/select/pan_stereo_width", _strip->pan_width_control());
-               }
+       boost::shared_ptr<Controllable> width_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_width_control());
+       if (width_controllable) {
+               width_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_width"), _strip->pan_width_control()), OSC::instance());
+               change_message ("/select/pan_stereo_width", _strip->pan_width_control());
+       }
 
+       // Rest of possible pan controls... Untested because I can't find a way to get them in the GUI :)
+       if (_strip->pan_elevation_control ()) {
+               _strip->pan_elevation_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_elevation_position"), _strip->pan_elevation_control()), OSC::instance());
+               change_message ("/select/pan_elevation_position", _strip->pan_elevation_control());
+       }
+       if (_strip->pan_frontback_control ()) {
+               _strip->pan_frontback_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_frontback_position"), _strip->pan_frontback_control()), OSC::instance());
+               change_message ("/select/pan_frontback_position", _strip->pan_frontback_control());
+       }
+       if (_strip->pan_lfe_control ()) {
+               _strip->pan_lfe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_lfe_control"), _strip->pan_lfe_control()), OSC::instance());
+               change_message ("/select/pan_lfe_control", _strip->pan_lfe_control());
        }
-       if (feedback[13]) { // Well known controls
-               // Rest of possible pan controls... Untested because I can't find a way to get them in the GUI :)
-               if (_strip->pan_elevation_control ()) {
-                       _strip->pan_elevation_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_elevation_position"), _strip->pan_elevation_control()), OSC::instance());
-                       change_message ("/select/pan_elevation_position", _strip->pan_elevation_control());
-               }
-               if (_strip->pan_frontback_control ()) {
-                       _strip->pan_frontback_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_frontback_position"), _strip->pan_frontback_control()), OSC::instance());
-                       change_message ("/select/pan_frontback_position", _strip->pan_frontback_control());
-               }
-               if (_strip->pan_lfe_control ()) {
-                       _strip->pan_lfe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_lfe_control"), _strip->pan_lfe_control()), OSC::instance());
-                       change_message ("/select/pan_lfe_control", _strip->pan_lfe_control());
-               }
 
-               // sends and eq
-               // detecting processor changes requires cast to route
-               boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(_strip);
-               if (r) {
-                       r->processors_changed.connect  (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_restart, this, -1), OSC::instance());
-                       send_init();
-                       eq_init();
-               }
+       // sends, plugins and eq
+       // detecting processor changes is now in osc.cc
 
-               // Compressor
-               if (_strip->comp_enable_controllable ()) {
-                       _strip->comp_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/comp_enable"), _strip->comp_enable_controllable()), OSC::instance());
-                       enable_message ("/select/comp_enable", _strip->comp_enable_controllable());
-               }
-               if (_strip->comp_threshold_controllable ()) {
-                       _strip->comp_threshold_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_threshold"), _strip->comp_threshold_controllable()), OSC::instance());
-                       change_message ("/select/comp_threshold", _strip->comp_threshold_controllable());
-               }
-               if (_strip->comp_speed_controllable ()) {
-                       _strip->comp_speed_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_speed"), _strip->comp_speed_controllable()), OSC::instance());
-                       change_message ("/select/comp_speed", _strip->comp_speed_controllable());
-               }
-               if (_strip->comp_mode_controllable ()) {
-                       _strip->comp_mode_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::comp_mode, this), OSC::instance());
-                       comp_mode ();
-               }
-               if (_strip->comp_makeup_controllable ()) {
-                       _strip->comp_makeup_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_makeup"), _strip->comp_makeup_controllable()), OSC::instance());
-                       change_message ("/select/comp_makeup", _strip->comp_makeup_controllable());
-               }
+       // but... MB master send enable is different
+       if (_strip->master_send_enable_controllable ()) {
+               _strip->master_send_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/master_send_enable"), _strip->master_send_enable_controllable()), OSC::instance());
+               enable_message ("/select/master_send_enable", _strip->master_send_enable_controllable());
+       }
 
+       // Compressor
+       if (_strip->comp_enable_controllable ()) {
+               _strip->comp_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/comp_enable"), _strip->comp_enable_controllable()), OSC::instance());
+               enable_message ("/select/comp_enable", _strip->comp_enable_controllable());
+       }
+       if (_strip->comp_threshold_controllable ()) {
+               _strip->comp_threshold_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_threshold"), _strip->comp_threshold_controllable()), OSC::instance());
+               change_message ("/select/comp_threshold", _strip->comp_threshold_controllable());
        }
+       if (_strip->comp_speed_controllable ()) {
+               _strip->comp_speed_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_speed"), _strip->comp_speed_controllable()), OSC::instance());
+               change_message ("/select/comp_speed", _strip->comp_speed_controllable());
+       }
+       if (_strip->comp_mode_controllable ()) {
+               _strip->comp_mode_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::comp_mode, this), OSC::instance());
+               comp_mode ();
+       }
+       if (_strip->comp_makeup_controllable ()) {
+               _strip->comp_makeup_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_makeup"), _strip->comp_makeup_controllable()), OSC::instance());
+               change_message ("/select/comp_makeup", _strip->comp_makeup_controllable());
+       }
+       renew_sends ();
+       renew_plugin ();
+       eq_restart(0);
+       _init = false;
 
        tick();
 }
 
-OSCSelectObserver::~OSCSelectObserver ()
+void
+OSCSelectObserver::set_expand (uint32_t expand)
 {
-       strip_connections.drop_connections ();
-       // all strip buttons should be off and faders 0 and etc.
-       if (feedback[0]) { // buttons are separate feedback
-               clear_strip ("/select/expand", 0);
-               text_message ("/select/name", " ");
-               text_message ("/select/comment", " ");
-               clear_strip ("/select/mute", 0);
-               clear_strip ("/select/solo", 0);
-               clear_strip ("/select/recenable", 0);
-               clear_strip ("/select/record_safe", 0);
-               clear_strip ("/select/monitor_input", 0);
-               clear_strip ("/select/monitor_disk", 0);
-               clear_strip ("/select/polarity", 0);
-               clear_strip ("/select/n_inputs", 0);
-               clear_strip ("/select/n_outputs", 0);
-       }
-       if (feedback[1]) { // level controls
-               if (gainmode) {
-                       clear_strip ("/select/fader", 0);
+       if (expand != _expand) {
+               _expand = expand;
+               if (expand) {
+                       _osc.float_message ("/select/expand", 1.0, addr);
                } else {
-                       clear_strip ("/select/gain", -193);
+                       _osc.float_message ("/select/expand", 0.0, addr);
                }
-               clear_strip ("/select/trimdB", 0);
-               clear_strip ("/select/pan_stereo_position", 0.5);
-               clear_strip ("/select/pan_stereo_width", 1);
        }
+}
+
+void
+OSCSelectObserver::clear_observer ()
+{
+       _init = true;
+       strip_connections.drop_connections ();
+       // all strip buttons should be off and faders 0 and etc.
+       _osc.float_message ("/select/expand", 0, addr);
+       _osc.text_message ("/select/name", " ", addr);
+       _osc.text_message ("/select/comment", " ", addr);
+       _osc.float_message ("/select/mute", 0, addr);
+       _osc.float_message ("/select/solo", 0, addr);
+       _osc.float_message ("/select/recenable", 0, addr);
+       _osc.float_message ("/select/record_safe", 0, addr);
+       _osc.float_message ("/select/monitor_input", 0, addr);
+       _osc.float_message ("/select/monitor_disk", 0, addr);
+       _osc.float_message ("/select/polarity", 0, addr);
+       _osc.float_message ("/select/n_inputs", 0, addr);
+       _osc.float_message ("/select/n_outputs", 0, addr);
+       if (gainmode) {
+               _osc.float_message ("/select/fader", 0, addr);
+       } else {
+               _osc.float_message ("/select/gain", -193, addr);
+       }
+       _osc.float_message ("/select/trimdB", 0, addr);
+       _osc.float_message ("/select/pan_stereo_position", 0.5, addr);
+       _osc.float_message ("/select/pan_stereo_width", 1, addr);
        if (feedback[9]) {
-               clear_strip ("/select/signal", 0);
+               _osc.float_message ("/select/signal", 0, addr);
        }
        if (feedback[7]) {
                if (gainmode) {
-                       clear_strip ("/select/meter", 0);
+                       _osc.float_message ("/select/meter", 0, addr);
                } else {
-                       clear_strip ("/select/meter", -193);
+                       _osc.float_message ("/select/meter", -193, addr);
                }
        }else if (feedback[8]) {
-               clear_strip ("/select/meter", 0);
-       }
-       if (feedback[13]) { // Well known controls
-               clear_strip ("/select/pan_elevation_position", 0);
-               clear_strip ("/select/pan_frontback_position", .5);
-               clear_strip ("/select/pan_lfe_control", 0);
-               clear_strip ("/select/comp_enable", 0);
-               clear_strip ("/select/comp_threshold", 0);
-               clear_strip ("/select/comp_speed", 0);
-               clear_strip ("/select/comp_mode", 0);
-               text_message ("/select/comp_mode_name", " ");
-               text_message ("/select/comp_speed_name", " ");
-               clear_strip ("/select/comp_makeup", 0);
-       }
+               _osc.float_message ("/select/meter", 0, addr);
+       }
+       _osc.float_message ("/select/pan_elevation_position", 0, addr);
+       _osc.float_message ("/select/pan_frontback_position", .5, addr);
+       _osc.float_message ("/select/pan_lfe_control", 0, addr);
+       _osc.float_message ("/select/comp_enable", 0, addr);
+       _osc.float_message ("/select/comp_threshold", 0, addr);
+       _osc.float_message ("/select/comp_speed", 0, addr);
+       _osc.float_message ("/select/comp_mode", 0, addr);
+       _osc.text_message ("/select/comp_mode_name", " ", addr);
+       _osc.text_message ("/select/comp_speed_name", " ", addr);
+       _osc.float_message ("/select/comp_makeup", 0, addr);
+       _osc.float_message ("/select/expand", 0.0, addr);
        send_end();
+       plugin_end();
        eq_end();
+}
 
-       lo_address_free (addr);
+void
+OSCSelectObserver::set_send_page (uint32_t page)
+{
+       if (send_page != page) {
+               send_page = page;
+               renew_sends ();
+       }
+}
+
+void
+OSCSelectObserver::set_send_size (uint32_t size)
+{
+       send_page_size = size;
+       renew_sends ();
+}
+
+void
+OSCSelectObserver::renew_sends () {
+       send_connections.drop_connections ();
+       send_timeout.clear();
+       send_init();
 }
 
 void
 OSCSelectObserver::send_init()
 {
-       // we don't know how many there are, so find out.
-       bool sends;
-       do {
-               sends = false;
-               if (_strip->send_level_controllable (nsends)) {
-                       _strip->send_level_controllable(nsends)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain, this, nsends, _strip->send_level_controllable(nsends)), OSC::instance());
-                       send_timeout.push_back (0);
-                       send_gain (nsends, _strip->send_level_controllable(nsends));
-                       sends = true;
+       send_size = nsends;
+       if (send_page_size) {
+               send_size = send_page_size;
+       }
+       if (!send_size) {
+               return;
+       }
+       uint32_t page_start = ((send_page - 1) * send_size);
+       uint32_t last_send = send_page * send_size;
+       uint32_t c = 1;
+       send_timeout.push_back (2);
+       _last_send.clear();
+       _last_send.push_back (0.0);
+
+       for (uint32_t s = page_start; s < last_send; ++s, ++c) {
+
+               bool send_valid = false;
+               if (_strip->send_level_controllable (s)) {
+                       _strip->send_level_controllable(s)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain, this, c, _strip->send_level_controllable(s)), OSC::instance());
+                       send_timeout.push_back (2);
+                       _last_send.push_back (20.0);
+                       send_gain (c, _strip->send_level_controllable(s));
+                       send_valid = true;
+               } else {
+                       send_gain (c, _strip->send_level_controllable(s));
+                       _osc.float_message_with_id ("/select/send_enable", c, 0, in_line, addr);
+                       _osc.text_message_with_id ("/select/send_name", c, " ", in_line, addr);
                }
 
-               if (_strip->send_enable_controllable (nsends)) {
-                       _strip->send_enable_controllable(nsends)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message_with_id, this, X_("/select/send_enable"), nsends + 1, _strip->send_enable_controllable(nsends)), OSC::instance());
-                       enable_message_with_id ("/select/send_enable", nsends + 1, _strip->send_enable_controllable(nsends));
-                       sends = true;
-               } else if (sends) {
+               if (_strip->send_enable_controllable (s)) {
+                       _strip->send_enable_controllable(s)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message_with_id, this, X_("/select/send_enable"), c, _strip->send_enable_controllable(s)), OSC::instance());
+                       enable_message_with_id ("/select/send_enable", c, _strip->send_enable_controllable(s));
+               } else if (send_valid) {
                        boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (_strip);
                        if (!r) {
                                // should never get here
-                               clear_strip_with_id ("/select/send_enable", nsends + 1, 0);
+                               _osc.float_message_with_id ("/select/send_enable", c, 0, in_line, addr);
                        }
-                       boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(nsends));
+                       boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(s));
                        if (snd) {
                                boost::shared_ptr<Processor> proc = boost::dynamic_pointer_cast<Processor> (snd);
-                               proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_enable, this, X_("/select/send_enable"), nsends + 1, proc), OSC::instance());
-                               clear_strip_with_id ("/select/send_enable", nsends + 1, proc->enabled());
+                               proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_enable, this, X_("/select/send_enable"), c, proc), OSC::instance());
+                               _osc.float_message_with_id ("/select/send_enable", c, proc->enabled(), in_line, addr);
                        }
                }
-               // this should get signalled by the route the send goes to, (TODO)
-               if (!gainmode && sends) { // if the gain control is there, this is too
-                       text_with_id ("/select/send_name", nsends + 1, _strip->send_name(nsends));
+               if ((gainmode != 1) && send_valid) {
+                       _osc.text_message_with_id ("/select/send_name", c, _strip->send_name(s), in_line, addr);
                }
-               // Send numbers are 0 based, OSC is 1 based so this gets incremented at the end
-               if (sends) {
-                       nsends++;
-               }
-       } while (sends);
+       }
 }
 
 void
 OSCSelectObserver::send_end ()
 {
        send_connections.drop_connections ();
-       for (uint32_t i = 1; i <= nsends; i++) {
+       for (uint32_t i = 1; i <= send_size; i++) {
                if (gainmode) {
-                       clear_strip_with_id ("/select/send_fader", i, 0);
+                       _osc.float_message_with_id ("/select/send_fader", i, 0, in_line, addr);
                } else {
-                       clear_strip_with_id ("/select/send_gain", i, -193);
+                       _osc.float_message_with_id ("/select/send_gain", i, -193, in_line, addr);
                }
                // next enable
-               clear_strip_with_id ("/select/send_enable", i, 0);
+               _osc.float_message_with_id ("/select/send_enable", i, 0, in_line, addr);
                // next name
-               text_with_id ("/select/send_name", i, " ");
+               _osc.text_message_with_id ("/select/send_name", i, " ", in_line, addr);
        }
-       nsends = 0;
+       // need to delete or clear send_timeout
+       send_size = 0;
+       send_timeout.clear();
 }
 
 void
-OSCSelectObserver::send_restart(int x)
+OSCSelectObserver::set_plugin_id (int id, uint32_t page)
 {
-       send_end();
-       send_init();
+       plug_id = id;
+       plug_page = page;
+       renew_plugin ();
+}
+
+void
+OSCSelectObserver::set_plugin_page (uint32_t page)
+{
+       plug_page = page;
+       renew_plugin ();
+}
+
+void
+OSCSelectObserver::set_plugin_size (uint32_t size)
+{
+       plug_page_size = size;
+       renew_plugin ();
+}
+
+void
+OSCSelectObserver::renew_plugin () {
+       plugin_connections.drop_connections ();
+       plugin_init();
+}
+
+void
+OSCSelectObserver::plugin_init()
+{
+       if (plug_id < 0) {
+               plugin_end ();
+               return;
+       }
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(_strip);
+       if (!r) {
+               plugin_end ();
+               return;
+       }
+
+       // we have a plugin number now get the processor
+       boost::shared_ptr<Processor> proc = r->nth_plugin (plug_id);
+       boost::shared_ptr<PluginInsert> pi;
+       if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(proc))) {
+               plugin_end ();
+               return;
+       }
+       boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+       // we have a plugin we can ask if it is activated
+       proc->ActiveChanged.connect (plugin_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::plug_enable, this, X_("/select/plugin/activate"), proc), OSC::instance());
+       _osc.float_message ("/select/plugin/activate", proc->enabled(), addr);
+
+       bool ok = false;
+       // put only input controls into a vector
+       plug_params.clear ();
+       uint32_t nplug_params  = pip->parameter_count();
+       for ( uint32_t ppi = 0;  ppi < nplug_params; ++ppi) {
+               uint32_t controlid = pip->nth_parameter(ppi, ok);
+               if (!ok) {
+                       continue;
+               }
+               if (pip->parameter_is_input(controlid)) {
+                       plug_params.push_back (ppi);
+               }
+       }
+       nplug_params = plug_params.size ();
+
+       // default of 0 page size means show all
+       plug_size = nplug_params;
+       if (plug_page_size) {
+               plug_size = plug_page_size;
+       }
+       _osc.text_message ("/select/plugin/name", pip->name(), addr);
+       uint32_t page_start = plug_page - 1;
+       uint32_t page_end = page_start + plug_size;
+
+       int pid = 1;
+       for ( uint32_t ppi = page_start;  ppi < page_end; ++ppi, ++pid) {
+               if (ppi >= nplug_params) {
+                       _osc.text_message_with_id ("/select/plugin/parameter/name", pid, " ", in_line, addr);
+                       _osc.float_message_with_id ("/select/plugin/parameter", pid, 0, in_line, addr);
+                       continue;
+               }
+
+               uint32_t controlid = pip->nth_parameter(plug_params[ppi], ok);
+               if (!ok) {
+                       continue;
+               }
+               ParameterDescriptor pd;
+               pip->get_parameter_descriptor(controlid, pd);
+               _osc.text_message_with_id ("/select/plugin/parameter/name", pid, pd.label, in_line, addr);
+               if ( pip->parameter_is_input(controlid)) {
+                       boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
+                       if (c) {
+                               bool swtch = false;
+                               if (pd.integer_step && pd.upper == 1) {
+                                       swtch = true;
+                               }
+                               c->Changed.connect (plugin_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::plugin_parameter_changed, this, pid, swtch, c), OSC::instance());
+                               plugin_parameter_changed (pid, swtch, c);
+                       }
+               }
+       }
+}
+
+void
+OSCSelectObserver::plugin_parameter_changed (int pid, bool swtch, boost::shared_ptr<PBD::Controllable> controllable)
+{
+       if (swtch) {
+               enable_message_with_id ("/select/plugin/parameter", pid, controllable);
+       } else {
+               change_message_with_id ("/select/plugin/parameter", pid, controllable);
+       }
+}
+
+void
+OSCSelectObserver::plugin_end ()
+{
+       plugin_connections.drop_connections ();
+       _osc.float_message ("/select/plugin/activate", 0, addr);
+       _osc.text_message ("/select/plugin/name", " ", addr);
+       for (uint32_t i = 1; i <= plug_size; i++) {
+               _osc.float_message_with_id ("/select/plugin/parameter", i, 0, in_line, addr);
+               // next name
+               _osc.text_message_with_id ("/select/plugin/parameter/name", i, " ", in_line, addr);
+       }
+       plug_size = 0;
+       nplug_params = 0;
 }
 
 void
 OSCSelectObserver::tick ()
 {
+       if (_init) {
+               return;
+       }
+       _tick_busy = true;
        if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled
                float now_meter;
                if (_strip->peak_meter()) {
@@ -321,69 +563,60 @@ OSCSelectObserver::tick ()
                if (_last_meter != now_meter) {
                        if (feedback[7] || feedback[8]) {
                                string path = "/select/meter";
-                               lo_message msg = lo_message_new ();
                                if (gainmode && feedback[7]) {
-                                       lo_message_add_float (msg, ((now_meter + 94) / 100));
-                                       lo_send_message (addr, path.c_str(), msg);
+                                       _osc.float_message (path, ((now_meter + 94) / 100), addr);
                                } else if ((!gainmode) && feedback[7]) {
-                                       lo_message_add_float (msg, now_meter);
-                                       lo_send_message (addr, path.c_str(), msg);
+                                       _osc.float_message (path, now_meter, addr);
                                } else if (feedback[8]) {
                                        uint32_t ledlvl = (uint32_t)(((now_meter + 54) / 3.75)-1);
                                        uint16_t ledbits = ~(0xfff<<ledlvl);
-                                       lo_message_add_int32 (msg, ledbits);
-                                       lo_send_message (addr, path.c_str(), msg);
+                                       _osc.float_message (path, ledbits, addr);
                                }
-                               lo_message_free (msg);
                        }
                        if (feedback[9]) {
                                string path = "/select/signal";
-                               lo_message msg = lo_message_new ();
                                float signal;
                                if (now_meter < -40) {
                                        signal = 0;
                                } else {
                                        signal = 1;
                                }
-                               lo_message_add_float (msg, signal);
-                               lo_send_message (addr, path.c_str(), msg);
-                               lo_message_free (msg);
+                               _osc.float_message (path, signal, addr);
                        }
                }
                _last_meter = now_meter;
 
        }
-       if (feedback[1]) {
-               if (gain_timeout) {
-                       if (gain_timeout == 1) {
-                               text_message ("/select/name", _strip->name());
-                       }
-                       gain_timeout--;
+       if (gain_timeout) {
+               if (gain_timeout == 1) {
+                       _osc.text_message ("/select/name", _strip->name(), addr);
                }
+               gain_timeout--;
        }
-       if (feedback[13]) {
-               for (uint32_t i = 0; i < send_timeout.size(); i++) {
-                       if (send_timeout[i]) {
-                               if (send_timeout[i] == 1) {
-                                       text_with_id ("/select/send_name", i + 1, _strip->send_name(i));
-                               }
-                               send_timeout[i]--;
-                       }
+
+       if (as == ARDOUR::Play ||  as == ARDOUR::Touch) {
+               if(_last_gain != _strip->gain_control()->get_value()) {
+                       _last_gain = _strip->gain_control()->get_value();
+                               gain_message ();
                }
        }
-       if (feedback[1]) {
-               if (as != ARDOUR::Off) {
-                       if(_last_gain != _strip->gain_control()->get_value()) {
-                               _last_gain = _strip->gain_control()->get_value();
-                               if (gainmode) {
-                                       gain_message ("/select/fader", _strip->gain_control());
-                               } else {
-                                       gain_message ("/select/fader", _strip->gain_control());
-                               }
+       if (_strip->comp_redux_controllable() && _strip->comp_enable_controllable() && _strip->comp_enable_controllable()->get_value()) {
+               float new_value = _strip->comp_redux_controllable()->get_parameter();
+               if (_comp_redux != new_value) {
+                       _osc.float_message ("/select/comp_redux", new_value, addr);
+                       _comp_redux = new_value;
+               }
+       }
+       for (uint32_t i = 1; i <= send_timeout.size(); i++) {
+               if (send_timeout[i]) {
+                       if (send_timeout[i] == 1) {
+                               uint32_t pg_offset = (send_page - 1) * send_page_size;
+                               _osc.text_message_with_id ("/select/send_name", i, _strip->send_name(pg_offset + i - 1), in_line, addr);
                        }
+                       send_timeout[i]--;
                }
        }
-
+       _tick_busy = false;
 }
 
 void
@@ -397,28 +630,30 @@ OSCSelectObserver::name_changed (const PBD::PropertyChange& what_changed)
                return;
        }
 
-       text_message ("/select/name", _strip->name());
+       _osc.text_message ("/select/name", _strip->name(), addr);
        boost::shared_ptr<Route> route = boost::dynamic_pointer_cast<Route> (_strip);
        if (route) {
                //spit out the comment at the same time
-               text_message ("/select/comment", route->comment());
+               _osc.text_message ("/select/comment", route->comment(), addr);
                // lets tell the surface how many inputs this strip has
-               clear_strip ("/select/n_inputs", (float) route->n_inputs().n_total());
+               _osc.float_message ("/select/n_inputs", (float) route->n_inputs().n_total(), addr);
                // lets tell the surface how many outputs this strip has
-               clear_strip ("/select/n_outputs", (float) route->n_outputs().n_total());
+               _osc.float_message ("/select/n_outputs", (float) route->n_outputs().n_total(), addr);
        }
 }
 
+void
+OSCSelectObserver::pi_changed (PBD::PropertyChange const& what_changed)
+{
+       _osc.float_message ("/select/hide", _strip->is_hidden (), addr);
+}
+
 void
 OSCSelectObserver::change_message (string path, boost::shared_ptr<Controllable> controllable)
 {
-       lo_message msg = lo_message_new ();
        float val = controllable->get_value();
 
-       lo_message_add_float (msg, (float) controllable->internal_to_interface (val));
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
+       _osc.float_message (path, (float) controllable->internal_to_interface (val), addr);
 }
 
 void
@@ -426,28 +661,28 @@ OSCSelectObserver::enable_message (string path, boost::shared_ptr<Controllable>
 {
        float val = controllable->get_value();
        if (val) {
-               clear_strip (path, 1);
+               _osc.float_message (path, 1, addr);
        } else {
-               clear_strip (path, 0);
+               _osc.float_message (path, 0, addr);
        }
 
 }
 
+void
+OSCSelectObserver::plug_enable (string path, boost::shared_ptr<Processor> proc)
+{
+       // with no delay value is wrong
+       Glib::usleep(10);
+
+       _osc.float_message (path, proc->enabled(), addr);
+}
+
 void
 OSCSelectObserver::change_message_with_id (string path, uint32_t id, boost::shared_ptr<Controllable> controllable)
 {
-       lo_message msg = lo_message_new ();
        float val = controllable->get_value();
-       if (feedback[2]) {
-               path = set_path (path, id);
-       } else {
-               lo_message_add_int32 (msg, id);
-       }
-
-       lo_message_add_float (msg, (float) controllable->internal_to_interface (val));
 
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
+       _osc.float_message_with_id (path, id, (float) controllable->internal_to_interface (val), in_line, addr);
 }
 
 void
@@ -455,23 +690,12 @@ OSCSelectObserver::enable_message_with_id (string path, uint32_t id, boost::shar
 {
        float val = controllable->get_value();
        if (val) {
-               clear_strip_with_id (path, id, 1);
+               _osc.float_message_with_id (path, id, 1, in_line, addr);
        } else {
-               clear_strip_with_id (path, id, 0);
+               _osc.float_message_with_id (path, id, 0, in_line, addr);
        }
 }
 
-void
-OSCSelectObserver::text_message (string path, std::string text)
-{
-       lo_message msg = lo_message_new ();
-
-       lo_message_add_string (msg, text.c_str());
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
-}
-
 void
 OSCSelectObserver::monitor_status (boost::shared_ptr<Controllable> controllable)
 {
@@ -491,98 +715,131 @@ OSCSelectObserver::monitor_status (boost::shared_ptr<Controllable> controllable)
                        input = 0;
        }
 
-       clear_strip ("/select/monitor_input", (float) input);
-       clear_strip ("/select/monitor_disk", (float) disk);
+       _osc.float_message ("/select/monitor_input", (float) input, addr);
+       _osc.float_message ("/select/monitor_disk", (float) disk, addr);
 }
 
 void
 OSCSelectObserver::trim_message (string path, boost::shared_ptr<Controllable> controllable)
 {
-       lo_message msg = lo_message_new ();
-
-       lo_message_add_float (msg, (float) accurate_coefficient_to_dB (controllable->get_value()));
+       if (_last_trim != controllable->get_value()) {
+               _last_trim = controllable->get_value();
+       } else {
+               return;
+       }
 
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
+       _osc.float_message (path, (float) accurate_coefficient_to_dB (controllable->get_value()), addr);
 }
 
 void
-OSCSelectObserver::gain_message (string path, boost::shared_ptr<Controllable> controllable)
+OSCSelectObserver::gain_message ()
 {
-       lo_message msg = lo_message_new ();
+       float value = _strip->gain_control()->get_value();
+       if (_last_gain != value) {
+               _last_gain = value;
+       } else {
+               return;
+       }
 
        if (gainmode) {
-               lo_message_add_float (msg, gain_to_slider_position (controllable->get_value()));
-               text_message ("/select/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())));
-               gain_timeout = 8;
-       } else {
-               if (controllable->get_value() < 1e-15) {
-                       lo_message_add_float (msg, -200);
+               _osc.float_message ("/select/fader", _strip->gain_control()->internal_to_interface (value), addr);
+               if (gainmode == 1) {
+                       _osc.text_message ("/select/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr);
+                       gain_timeout = 8;
+               }
+       }
+       if (!gainmode || gainmode == 2) {
+               if (value < 1e-15) {
+                       _osc.float_message ("/select/gain", -200, addr);
                } else {
-                       lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value()));
+                       _osc.float_message ("/select/gain", accurate_coefficient_to_dB (value), addr);
                }
        }
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
 }
 
 void
-OSCSelectObserver::gain_automation (string path)
+OSCSelectObserver::gain_automation ()
 {
-       lo_message msg = lo_message_new ();
-       string apath = string_compose ("%1/automation", path);
+       float output = 0;
+       as = _strip->gain_control()->alist()->automation_state();
+       string auto_name;
+       switch (as) {
+               case ARDOUR::Off:
+                       output = 0;
+                       auto_name = "Manual";
+                       break;
+               case ARDOUR::Play:
+                       output = 1;
+                       auto_name = "Play";
+                       break;
+               case ARDOUR::Write:
+                       output = 2;
+                       auto_name = "Write";
+                       break;
+               case ARDOUR::Touch:
+                       output = 3;
+                       auto_name = "Touch";
+                       break;
+               default:
+                       break;
+       }
+
+       if (gainmode) {
+               _osc.float_message ("/select/fader/automation", output, addr);
+               _osc.text_message ("/select/fader/automation_name", auto_name, addr);
+       } else {
+               _osc.float_message ("/select/gain/automation", output, addr);
+               _osc.text_message ("/select/gain/automation_name", auto_name, addr);
+       }
 
-       boost::shared_ptr<GainControl> control = _strip->gain_control();
-       as = control->alist()->automation_state();
-       lo_message_add_float (msg, as);
-       gain_message (path, control);
-       lo_send_message (addr, apath.c_str(), msg);
-       lo_message_free (msg);
+       gain_message ();
 }
 
 void
 OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable)
 {
-       lo_message msg = lo_message_new ();
+       float raw_value = 0.0;
+       if (controllable) {
+               raw_value = controllable->get_value();
+       }
+       if (_last_send[id] != raw_value) {
+               _last_send[id] = raw_value;
+       } else {
+               return;
+       }
        string path;
-       float value;
+       float value = 0.0;
        float db;
 #ifdef MIXBUS
-               db = controllable->get_value();
+       if (controllable) {
+               db = raw_value;
+       } else {
+               db = -193;
+       }
 #else
-               if (controllable->get_value() < 1e-15) {
-                       db = -193;
-               } else {
-                       db = accurate_coefficient_to_dB (controllable->get_value());
-               }
+       if (raw_value < 1e-15) {
+               db = -193;
+       } else {
+               db = accurate_coefficient_to_dB (raw_value);
+       }
 #endif
 
        if (gainmode) {
-               path = "/select/send_fader";
-#ifdef MIXBUS
-               value = controllable->internal_to_interface (controllable->get_value());
-#else
-               value = gain_to_slider_position (controllable->get_value());
-#endif
-       text_with_id ("/select/send_name" , id + 1, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db));
-       if (send_timeout.size() > id) {
-               send_timeout[id] = 8;
-       }
-       } else {
-               path = "/select/send_gain";
-               value = db;
+               if (controllable) {
+                       value = controllable->internal_to_interface (raw_value);
+               }
+               _osc.float_message_with_id ("/select/send_fader", id, value, in_line, addr);
+               if (gainmode == 1) {
+                       _osc.text_message_with_id ("/select/send_name" , id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db), in_line, addr);
+                       if (send_timeout.size() > id) {
+                               send_timeout[id] = 8;
+                       }
+               }
        }
-
-       if (feedback[2]) {
-               path = set_path (path, id + 1);
-       } else {
-               lo_message_add_int32 (msg, id + 1);
+       if (!gainmode || gainmode == 2) {
+               _osc.float_message_with_id ("/select/send_gain", id, db, in_line, addr);
        }
 
-       lo_message_add_float (msg, value);
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
 }
 
 void
@@ -591,54 +848,67 @@ OSCSelectObserver::send_enable (string path, uint32_t id, boost::shared_ptr<Proc
        // with no delay value is wrong
        Glib::usleep(10);
 
-       clear_strip_with_id ("/select/send_enable", id, proc->enabled());
-}
-
-void
-OSCSelectObserver::text_with_id (string path, uint32_t id, string name)
-{
-       lo_message msg = lo_message_new ();
-       if (feedback[2]) {
-               path = set_path (path, id);
-       } else {
-               lo_message_add_int32 (msg, id);
-       }
-
-       lo_message_add_string (msg, name.c_str());
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
+       _osc.float_message_with_id ("/select/send_enable", id, proc->enabled(), in_line, addr);
 }
 
 void
 OSCSelectObserver::comp_mode ()
 {
        change_message ("/select/comp_mode", _strip->comp_mode_controllable());
-       text_message ("/select/comp_mode_name", _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()));
-       text_message ("/select/comp_speed_name", _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()));
+       _osc.text_message ("/select/comp_mode_name", _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()), addr);
+       _osc.text_message ("/select/comp_speed_name", _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()), addr);
 }
 
 void
 OSCSelectObserver::eq_init()
 {
        // HPF and enable are special case, rest are in bands
-       if (_strip->eq_hpf_controllable ()) {
-               _strip->eq_hpf_controllable ()->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf"), _strip->eq_hpf_controllable()), OSC::instance());
-               change_message ("/select/eq_hpf", _strip->eq_hpf_controllable());
+       if (_strip->filter_enable_controllable (true)) {
+               _strip->filter_enable_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/enable"), _strip->filter_enable_controllable (true)), OSC::instance());
+               change_message ("/select/eq_hpf/enable", _strip->filter_enable_controllable(true));
+       }
+
+       if (_strip->filter_enable_controllable (false)) {
+               _strip->filter_enable_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/enable"), _strip->filter_enable_controllable (false)), OSC::instance());
+               change_message ("/select/eq_lpf/enable", _strip->filter_enable_controllable(false));
+       }
+
+       if (_strip->filter_freq_controllable (true)) {
+               _strip->filter_freq_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/freq"), _strip->filter_freq_controllable (true)), OSC::instance());
+               change_message ("/select/eq_hpf/freq", _strip->filter_freq_controllable(true));
+       }
+
+       if (_strip->filter_freq_controllable (false)) {
+               _strip->filter_freq_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/freq"), _strip->filter_freq_controllable (false)), OSC::instance());
+               change_message ("/select/eq_lpf/freq", _strip->filter_freq_controllable(false));
+       }
+
+       if (_strip->filter_slope_controllable (true)) {
+               _strip->filter_slope_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/slope"), _strip->filter_slope_controllable (true)), OSC::instance());
+               change_message ("/select/eq_hpf/slope", _strip->filter_slope_controllable(true));
+       }
+
+       if (_strip->filter_slope_controllable (false)) {
+               _strip->filter_slope_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/slope"), _strip->filter_slope_controllable (false)), OSC::instance());
+               change_message ("/select/eq_lpf/slope", _strip->filter_slope_controllable(false));
        }
+
        if (_strip->eq_enable_controllable ()) {
                _strip->eq_enable_controllable ()->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/eq_enable"), _strip->eq_enable_controllable()), OSC::instance());
                enable_message ("/select/eq_enable", _strip->eq_enable_controllable());
        }
 
-       uint32_t eq_bands = _strip->eq_band_cnt ();
+       eq_bands = _strip->eq_band_cnt ();
+       if (eq_bands < 0) {
+               eq_bands = 0;
+       }
        if (!eq_bands) {
                return;
        }
 
-       for (uint32_t i = 0; i < eq_bands; i++) {
+       for (int i = 0; i < eq_bands; i++) {
                if (_strip->eq_band_name(i).size()) {
-                       text_with_id ("/select/eq_band_name", i + 1, _strip->eq_band_name (i));
+                       _osc.text_message_with_id ("/select/eq_band_name", i + 1, _strip->eq_band_name (i), in_line, addr);
                }
                if (_strip->eq_gain_controllable (i)) {
                        _strip->eq_gain_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_gain"), i + 1, _strip->eq_gain_controllable(i)), OSC::instance());
@@ -662,21 +932,16 @@ OSCSelectObserver::eq_init()
 void
 OSCSelectObserver::eq_end ()
 {
-       //need to check feedback for [13]
        eq_connections.drop_connections ();
-       if (_strip->eq_hpf_controllable ()) {
-               clear_strip ("/select/eq_hpf", 0);
-       }
-       if (_strip->eq_enable_controllable ()) {
-               clear_strip ("/select/eq_enable", 0);
-       }
+               _osc.float_message ("/select/eq_hpf", 0, addr);
+               _osc.float_message ("/select/eq_enable", 0, addr);
 
-       for (uint32_t i = 1; i <= _strip->eq_band_cnt (); i++) {
-               text_with_id ("/select/eq_band_name", i, " ");
-               clear_strip_with_id ("/select/eq_gain", i, 0);
-               clear_strip_with_id ("/select/eq_freq", i, 0);
-               clear_strip_with_id ("/select/eq_q", i, 0);
-               clear_strip_with_id ("/select/eq_shape", i, 0);
+       for (int i = 1; i <= eq_bands; i++) {
+               _osc.text_message_with_id ("/select/eq_band_name", i, " ", in_line, addr);
+               _osc.float_message_with_id ("/select/eq_gain", i, 0, in_line, addr);
+               _osc.float_message_with_id ("/select/eq_freq", i, 0, in_line, addr);
+               _osc.float_message_with_id ("/select/eq_q", i, 0, in_line, addr);
+               _osc.float_message_with_id ("/select/eq_shape", i, 0, in_line, addr);
 
 
        }
@@ -685,44 +950,7 @@ OSCSelectObserver::eq_end ()
 void
 OSCSelectObserver::eq_restart(int x)
 {
-       eq_end();
+       eq_connections.drop_connections ();
+       //eq_end();
        eq_init();
 }
-
-string
-OSCSelectObserver::set_path (string path, uint32_t id)
-{
-       if (feedback[2]) {
-               path = string_compose ("%1/%2", path, id);
-       }
-       return path;
-}
-
-void
-OSCSelectObserver::clear_strip (string path, float val)
-{
-       lo_message msg = lo_message_new ();
-       lo_message_add_float (msg, val);
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
-
-}
-
-void
-OSCSelectObserver::clear_strip_with_id (string path, uint32_t id, float val)
-{
-       lo_message msg = lo_message_new ();
-       if (feedback[2]) {
-               path = set_path (path, id);
-       } else {
-               lo_message_add_int32 (msg, id);
-       }
-
-       lo_message_add_float (msg, val);
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
-
-}
-