OSC: Add patch from 7137 and make it work for manual port selection.
[ardour.git] / libs / surfaces / osc / osc.cc
index 3f6656e8351191996a4d1dd4075df10379696ce9..c93827f7e453bb73dcb2c559d747d7d60c24e9af 100644 (file)
@@ -46,6 +46,7 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/presentation_info.h"
 #include "ardour/send.h"
+#include "ardour/internal_send.h"
 #include "ardour/phase_control.h"
 #include "ardour/solo_isolate_control.h"
 #include "ardour/solo_safe_control.h"
@@ -56,7 +57,7 @@
 #include "osc_controllable.h"
 #include "osc_route_observer.h"
 #include "osc_global_observer.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -91,6 +92,12 @@ OSC::OSC (Session& s, uint32_t port)
        , _osc_unix_server (0)
        , _send_route_changes (true)
        , _debugmode (Off)
+       , address_only (false)
+       , remote_port ("8000")
+       , default_banksize (0)
+       , default_strip (159)
+       , default_feedback (0)
+       , default_gainmode (0)
        , tick (true)
        , bank_dirty (false)
        , gui (0)
@@ -398,6 +405,8 @@ OSC::register_callbacks()
                REGISTER_CALLBACK (serv, "/set_surface/bank_size", "i", set_surface_bank_size);
                REGISTER_CALLBACK (serv, "/set_surface/gainmode", "i", set_surface_gainmode);
                REGISTER_CALLBACK (serv, "/set_surface/strip_types", "i", set_surface_strip_types);
+               REGISTER_CALLBACK (serv, "/refresh", "", refresh_surface);
+               REGISTER_CALLBACK (serv, "/refresh", "f", refresh_surface);
                REGISTER_CALLBACK (serv, "/strip/list", "", routes_list);
                REGISTER_CALLBACK (serv, "/add_marker", "", add_marker);
                REGISTER_CALLBACK (serv, "/add_marker", "f", add_marker);
@@ -443,6 +452,7 @@ OSC::register_callbacks()
                REGISTER_CALLBACK (serv, "/toggle_all_rec_enables", "f", toggle_all_rec_enables);
                REGISTER_CALLBACK (serv, "/all_tracks_rec_in", "f", all_tracks_rec_in);
                REGISTER_CALLBACK (serv, "/all_tracks_rec_out", "f", all_tracks_rec_out);
+               REGISTER_CALLBACK (serv, "/cancel_all_solos", "f", cancel_all_solos);
                REGISTER_CALLBACK (serv, "/remove_marker", "", remove_marker_at_playhead);
                REGISTER_CALLBACK (serv, "/remove_marker", "f", remove_marker_at_playhead);
                REGISTER_CALLBACK (serv, "/jump_bars", "f", jump_by_bars);
@@ -523,12 +533,12 @@ OSC::register_callbacks()
 
                // controls for "special" strips
                REGISTER_CALLBACK (serv, "/master/gain", "f", master_set_gain);
-               REGISTER_CALLBACK (serv, "/master/fader", "i", master_set_fader);
+               REGISTER_CALLBACK (serv, "/master/fader", "f", master_set_fader);
                REGISTER_CALLBACK (serv, "/master/mute", "i", master_set_mute);
                REGISTER_CALLBACK (serv, "/master/trimdB", "f", master_set_trim);
                REGISTER_CALLBACK (serv, "/master/pan_stereo_position", "f", master_set_pan_stereo_position);
                REGISTER_CALLBACK (serv, "/monitor/gain", "f", monitor_set_gain);
-               REGISTER_CALLBACK (serv, "/monitor/fader", "i", monitor_set_fader);
+               REGISTER_CALLBACK (serv, "/monitor/fader", "f", monitor_set_fader);
 
                // Controls for the Selected strip
                REGISTER_CALLBACK (serv, "/select/recenable", "i", sel_recenable);
@@ -551,13 +561,18 @@ OSC::register_callbacks()
                REGISTER_CALLBACK (serv, "/select/expand", "i", sel_expand);
                REGISTER_CALLBACK (serv, "/select/pan_elevation_position", "f", sel_pan_elevation);
                REGISTER_CALLBACK (serv, "/select/pan_frontback_position", "f", sel_pan_frontback);
-               REGISTER_CALLBACK (serv, "/select/pan_lfe_position", "f", sel_pan_lfe);
+               REGISTER_CALLBACK (serv, "/select/pan_lfe_control", "f", sel_pan_lfe);
                REGISTER_CALLBACK (serv, "/select/comp_enable", "f", sel_comp_enable);
                REGISTER_CALLBACK (serv, "/select/comp_threshold", "f", sel_comp_threshold);
                REGISTER_CALLBACK (serv, "/select/comp_speed", "f", sel_comp_speed);
                REGISTER_CALLBACK (serv, "/select/comp_mode", "f", sel_comp_mode);
                REGISTER_CALLBACK (serv, "/select/comp_makeup", "f", sel_comp_makeup);
-               REGISTER_CALLBACK (serv, "/select/comp_redux", "f", sel_comp_redux);
+               REGISTER_CALLBACK (serv, "/select/eq_enable", "f", sel_eq_enable);
+               REGISTER_CALLBACK (serv, "/select/eq_hpf", "f", sel_eq_hpf);
+               REGISTER_CALLBACK (serv, "/select/eq_gain", "if", sel_eq_gain);
+               REGISTER_CALLBACK (serv, "/select/eq_freq", "if", sel_eq_freq);
+               REGISTER_CALLBACK (serv, "/select/eq_q", "if", sel_eq_q);
+               REGISTER_CALLBACK (serv, "/select/eq_shape", "if", sel_eq_shape);
 
                /* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these  */ 
                REGISTER_CALLBACK (serv, "/strip/mute", "ii", route_mute);
@@ -579,10 +594,17 @@ OSC::register_callbacks()
                REGISTER_CALLBACK (serv, "/strip/plugin/parameter", "iiif", route_plugin_parameter);
                // prints to cerr only
                REGISTER_CALLBACK (serv, "/strip/plugin/parameter/print", "iii", route_plugin_parameter_print);
-               REGISTER_CALLBACK (serv, "/strip/send/gainabs", "iif", route_set_send_gain_abs);
+               REGISTER_CALLBACK (serv, "/strip/plugin/activate", "ii", route_plugin_activate);
+               REGISTER_CALLBACK (serv, "/strip/plugin/deactivate", "ii", route_plugin_deactivate);
                REGISTER_CALLBACK (serv, "/strip/send/gain", "iif", route_set_send_gain_dB);
                REGISTER_CALLBACK (serv, "/strip/send/fader", "iif", route_set_send_fader);
                REGISTER_CALLBACK (serv, "/strip/send/enable", "iif", route_set_send_enable);
+               REGISTER_CALLBACK(serv, "/strip/name", "is", route_rename);
+               REGISTER_CALLBACK(serv, "/strip/sends", "i", route_get_sends);
+               REGISTER_CALLBACK(serv, "/strip/receives", "i", route_get_receives);                
+               REGISTER_CALLBACK(serv, "/strip/plugin/list", "i", route_plugin_list);
+               REGISTER_CALLBACK(serv, "/strip/plugin/descriptor", "ii", route_plugin_descriptor);
+               REGISTER_CALLBACK(serv, "/strip/plugin/reset", "ii", route_plugin_reset);
 
                /* still not-really-standardized query interface */
                //REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
@@ -645,6 +667,12 @@ OSC::get_unix_server_url()
        return url;
 }
 
+void
+OSC::gui_changed ()
+{
+       session->set_dirty();
+}
+
 void
 OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
 {
@@ -802,7 +830,7 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m
                }
        }
 
-       lo_send_message (lo_message_get_source (msg), "#reply", reply);
+       lo_send_message (get_address (msg), "#reply", reply);
        lo_message_free (reply);
 }
 
@@ -829,7 +857,14 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
                current_value_query (path, len, argv, argc, msg);
                ret = 0;
 
-       } else if (strcmp (path, "/strip/listen") == 0) {
+       } else
+       if (!strncmp (path, "/cue/", 5)) {
+
+               //cue_parse (path, types, argv, argc, msg)
+
+               ret = 0;
+       } else
+       if (strcmp (path, "/strip/listen") == 0) {
 
                cerr << "set up listener\n";
 
@@ -848,101 +883,133 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
                                        break;
                                } else {
                                        cerr << "add listener\n";
-                                       listen_to_route (r, lo_message_get_source (msg));
+                                       listen_to_route (r, get_address (msg));
                                        lo_message_add_int32 (reply, argv[n]->i);
                                }
                        }
                }
 
-               lo_send_message (lo_message_get_source (msg), "#reply", reply);
+               lo_send_message (get_address (msg), "#reply", reply);
                lo_message_free (reply);
 
                ret = 0;
 
-       } else if (strcmp (path, "/strip/ignore") == 0) {
+       } else
+       if (strcmp (path, "/strip/ignore") == 0) {
 
                for (int n = 0; n < argc; ++n) {
 
                        boost::shared_ptr<Route> r = session->get_remote_nth_route (argv[n]->i);
 
                        if (r) {
-                               end_listen (r, lo_message_get_source (msg));
+                               end_listen (r, get_address (msg));
                        }
                }
 
                ret = 0;
-       } else if (argc == 1 && types[0] == 'f') { // single float -- probably TouchOSC
-               if (!strncmp (path, "/strip/gain/", 12) && strlen (path) > 12) {
-                       // in dB
-                       int ssid = atoi (&path[12]);
-                       route_set_gain_dB (ssid, argv[0]->f, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/fader/", 13) && strlen (path) > 13) {
-                       // in fader position
-                       int ssid = atoi (&path[13]);
-                       route_set_gain_fader (ssid, argv[0]->f, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/trimdB/", 14) && strlen (path) > 14) {
-                       int ssid = atoi (&path[14]);
-                       route_set_trim_dB (ssid, argv[0]->f, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/mute/", 12) && strlen (path) > 12) {
-                       int ssid = atoi (&path[12]);
-                       route_mute (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/solo/", 12) && strlen (path) > 12) {
-                       int ssid = atoi (&path[12]);
-                       route_solo (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/monitor_input/", 21) && strlen (path) > 21) {
-                       int ssid = atoi (&path[21]);
-                       route_monitor_input (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/monitor_disk/", 20) && strlen (path) > 20) {
-                       int ssid = atoi (&path[20]);
-                       route_monitor_disk (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/recenable/", 17) && strlen (path) > 17) {
-                       int ssid = atoi (&path[17]);
-                       route_recenable (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/record_safe/", 19) && strlen (path) > 19) {
-                       int ssid = atoi (&path[19]);
-                       route_recsafe (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/expand/", 14) && strlen (path) > 14) {
-                       int ssid = atoi (&path[14]);
-                       strip_expand (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
-                       int ssid = atoi (&path[14]);
-                       strip_gui_select (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) {
-                       int ssid = atoi (&path[18]);
-                       route_mute (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
-               else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) {
-                       int ssid = atoi (&path[19]);
-                       route_solo (ssid, argv[0]->f == 1.0, msg);
-                       ret = 0;
-               }
+       } else
+       if (!strncmp (path, "/strip/gain/", 12) && strlen (path) > 12) {
+               // in dB
+               int ssid = atoi (&path[12]);
+               route_set_gain_dB (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/fader/", 13) && strlen (path) > 13) {
+               // in fader position
+               int ssid = atoi (&path[13]);
+               route_set_gain_fader (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/trimdB/", 14) && strlen (path) > 14) {
+               int ssid = atoi (&path[14]);
+               route_set_trim_dB (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/pan_stereo_position/", 27) && strlen (path) > 27) {
+               int ssid = atoi (&path[27]);
+               route_set_pan_stereo_position (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/mute/", 12) && strlen (path) > 12) {
+               int ssid = atoi (&path[12]);
+               route_mute (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/solo/", 12) && strlen (path) > 12) {
+               int ssid = atoi (&path[12]);
+               route_solo (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/monitor_input/", 21) && strlen (path) > 21) {
+               int ssid = atoi (&path[21]);
+               route_monitor_input (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/monitor_disk/", 20) && strlen (path) > 20) {
+               int ssid = atoi (&path[20]);
+               route_monitor_disk (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/recenable/", 17) && strlen (path) > 17) {
+               int ssid = atoi (&path[17]);
+               route_recenable (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/record_safe/", 19) && strlen (path) > 19) {
+               int ssid = atoi (&path[19]);
+               route_recsafe (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/expand/", 14) && strlen (path) > 14) {
+               int ssid = atoi (&path[14]);
+               strip_expand (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
+               int ssid = atoi (&path[14]);
+               strip_gui_select (ssid, argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) {
+               int ssid = atoi (&path[18]);
+               sel_sendgain (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) {
+               int ssid = atoi (&path[19]);
+               sel_sendfader (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/send_enable/", 20) && strlen (path) > 20) {
+               int ssid = atoi (&path[20]);
+               sel_sendenable (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/eq_gain/", 16) && strlen (path) > 16) {
+               int ssid = atoi (&path[16]);
+               sel_eq_gain (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/eq_freq/", 16) && strlen (path) > 16) {
+               int ssid = atoi (&path[16]);
+               sel_eq_freq (ssid, argv[0]->f , msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/eq_q/", 13) && strlen (path) > 13) {
+               int ssid = atoi (&path[13]);
+               sel_eq_q (ssid, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/select/eq_shape/", 17) && strlen (path) > 17) {
+               int ssid = atoi (&path[17]);
+               sel_eq_shape (ssid, argv[0]->f, msg);
+               ret = 0;
        }
 
        if ((ret && _debugmode == Unhandled)) {
                debugmsg (_("Unhandled OSC message"), path, types, argv, argc);
+       } else if ((!ret && _debugmode == All)) {
+               debugmsg (_("OSC"), path, types, argv, argc);
        }
 
        return ret;
@@ -1122,7 +1189,7 @@ OSC::routes_list (lo_message msg)
                        /* XXX Can only use order at this point */
                        //lo_message_add_int32 (reply, r->presentation_info().order());
                        // try this instead.
-                       lo_message_add_int32 (reply, get_sid (r, lo_message_get_source (msg)));
+                       lo_message_add_int32 (reply, get_sid (r, get_address (msg)));
 
                        if (boost::dynamic_pointer_cast<AudioTrack>(r)
                                        || boost::dynamic_pointer_cast<MidiTrack>(r)) {
@@ -1132,9 +1199,9 @@ OSC::routes_list (lo_message msg)
                        }
 
                        //Automatically listen to routes listed
-                       listen_to_route(r, lo_message_get_source (msg));
+                       listen_to_route(r, get_address (msg));
 
-                       lo_send_message (lo_message_get_source (msg), "#reply", reply);
+                       lo_send_message (get_address (msg), "#reply", reply);
                        lo_message_free (reply);
                }
        }
@@ -1146,15 +1213,88 @@ OSC::routes_list (lo_message msg)
        lo_message_add_int64 (reply, session->frame_rate());
        lo_message_add_int64 (reply, session->current_end_frame());
 
-       lo_send_message (lo_message_get_source (msg), "#reply", reply);
+       lo_send_message (get_address (msg), "#reply", reply);
 
        lo_message_free (reply);
 }
 
+int
+OSC::cancel_all_solos ()
+{
+       session->cancel_all_solo ();
+       return 0;
+}
+
+lo_address
+OSC::get_address (lo_message msg)
+{
+       if (address_only) {
+               lo_address addr = lo_message_get_source (msg);
+               string host = lo_address_get_hostname (addr);
+               int protocol = lo_address_get_protocol (addr);
+               return lo_address_new_with_proto (protocol, host.c_str(), remote_port.c_str());
+       } else {
+               return lo_message_get_source (msg);
+       }
+}
+
+int
+OSC::refresh_surface (lo_message msg)
+{
+       if (address_only) {
+               // get rid of all surfaces and observers.
+               clear_devices();
+       }
+       OSCSurface *s = get_surface(get_address (msg));
+       // restart all observers
+       set_surface (s->bank_size, (uint32_t) s->strip_types.to_ulong(), (uint32_t) s->feedback.to_ulong(), (uint32_t) s->gainmode, msg);
+       return 0;
+}
+
+void
+OSC::clear_devices ()
+{
+       for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
+
+               OSCRouteObserver* rc;
+
+               if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+                       delete *x;
+                       x = route_observers.erase (x);
+               } else {
+                       ++x;
+               }
+               // slow devices need time to clear buffers
+               usleep ((uint32_t) 10);
+       }
+       // Should maybe do global_observers too
+       for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) {
+
+               OSCGlobalObserver* gc;
+
+               if ((gc = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
+                       delete *x;
+                       x = global_observers.erase (x);
+               } else {
+                       ++x;
+               }
+       }
+       // delete select observers
+       for (uint32_t it = 0; it < _surface.size(); ++it) {
+               OSCSurface* sur = &_surface[it];
+               OSCSelectObserver* so;
+               if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
+                       delete so;
+               }
+       }
+       // clear out surfaces
+       _surface.clear();
+}
+
 int
 OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, lo_message msg)
 {
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        s->bank_size = b_size;
        s->strip_types = strips;
        s->feedback = fb;
@@ -1162,14 +1302,14 @@ OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, lo
        // set bank and strip feedback
        set_bank(s->bank, msg);
 
-       global_feedback (s->feedback, msg, s->gainmode);
+       global_feedback (s->feedback, get_address (msg), s->gainmode);
        return 0;
 }
 
 int
 OSC::set_surface_bank_size (uint32_t bs, lo_message msg)
 {
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        s->bank_size = bs;
 
        // set bank and strip feedback
@@ -1180,7 +1320,7 @@ OSC::set_surface_bank_size (uint32_t bs, lo_message msg)
 int
 OSC::set_surface_strip_types (uint32_t st, lo_message msg)
 {
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        s->strip_types = st;
 
        // set bank and strip feedback
@@ -1192,14 +1332,14 @@ OSC::set_surface_strip_types (uint32_t st, lo_message msg)
 int
 OSC::set_surface_feedback (uint32_t fb, lo_message msg)
 {
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        s->feedback = fb;
 
        // set bank and strip feedback
        set_bank(s->bank, msg);
 
        // Set global/master feedback
-       global_feedback (s->feedback, msg, s->gainmode);
+       global_feedback (s->feedback, get_address (msg), s->gainmode);
        return 0;
 }
 
@@ -1207,14 +1347,14 @@ OSC::set_surface_feedback (uint32_t fb, lo_message msg)
 int
 OSC::set_surface_gainmode (uint32_t gm, lo_message msg)
 {
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        s->gainmode = gm;
 
        // set bank and strip feedback
        set_bank(s->bank, msg);
 
        // Set global/master feedback
-       global_feedback (s->feedback, msg, s->gainmode);
+       global_feedback (s->feedback, get_address (msg), s->gainmode);
        return 0;
 }
 
@@ -1242,10 +1382,10 @@ OSC::get_surface (lo_address addr)
        OSCSurface s;
        s.remote_url = r_url;
        s.bank = 1;
-       s.bank_size = 0; // need to find out how many strips there are
-       s.strip_types = 31; // 31 is tracks, busses, and VCAs (no master/monitor)
-       s.feedback = 0;
-       s.gainmode = 0;
+       s.bank_size = default_banksize; // need to find out how many strips there are
+       s.strip_types = default_strip; // 159 is tracks, busses, and VCAs (no master/monitor)
+       s.feedback = default_feedback;
+       s.gainmode = default_gainmode;
        s.sel_obs = 0;
        s.expand = 0;
        s.expand_enable = false;
@@ -1259,18 +1399,17 @@ OSC::get_surface (lo_address addr)
 
 // setup global feedback for a surface
 void
-OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
+OSC::global_feedback (bitset<32> feedback, lo_address addr, uint32_t gainmode)
 {
        // first destroy global observer for this surface
        GlobalObservers::iterator x;
-
        for (x = global_observers.begin(); x != global_observers.end();) {
 
                OSCGlobalObserver* ro;
 
                if ((ro = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
 
-                       int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(lo_message_get_source (msg)));
+                       int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
 
                        if (res == 0) {
                                delete *x;
@@ -1284,8 +1423,7 @@ OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
        }
        if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
                // create a new Global Observer for this surface
-               //OSCSurface *s = get_surface (lo_message_get_source (msg));
-               OSCGlobalObserver* o = new OSCGlobalObserver (*session, lo_message_get_source (msg), gainmode, /*s->*/feedback);
+               OSCGlobalObserver* o = new OSCGlobalObserver (*session, addr, gainmode, /*s->*/feedback);
                global_observers.push_back (o);
        }
 }
@@ -1293,14 +1431,14 @@ OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
 void
 OSC::notify_routes_added (ARDOUR::RouteList &)
 {
-       // not sure if we need this
+       // not sure if we need this PI change seems to cover
        //recalcbanks();
 }
 
 void
 OSC::notify_vca_added (ARDOUR::VCAList &)
 {
-       // not sure if we need this
+       // not sure if we need this PI change seems to cover
        //recalcbanks();
 }
 
@@ -1340,7 +1478,7 @@ OSC::_recalcbanks ()
 int
 OSC::set_bank (uint32_t bank_start, lo_message msg)
 {
-       return _set_bank (bank_start, lo_message_get_source (msg));
+       return _set_bank (bank_start, get_address (msg));
 }
 
 // set bank is callable with either message or address
@@ -1371,6 +1509,8 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr)
                if (stp) {
                        end_listen (stp, addr);
                }
+               // slow devices need time to clear buffers
+               usleep ((uint32_t) 10);
        }
 
        s->strips = get_sorted_stripables(s->strip_types);
@@ -1405,6 +1545,8 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr)
                                        listen_to_route(stp, addr);
                                }
                        }
+                       // slow devices need time to clear buffers
+                       usleep ((uint32_t) 10);
                }
        }
        // light bankup or bankdown buttons if it is possible to bank in that direction
@@ -1439,7 +1581,7 @@ OSC::bank_up (lo_message msg)
        if (!session) {
                return -1;
        }
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        set_bank (s->bank + s->bank_size, msg);
        return 0;
 }
@@ -1450,7 +1592,7 @@ OSC::bank_down (lo_message msg)
        if (!session) {
                return -1;
        }
-       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       OSCSurface *s = get_surface(get_address (msg));
        if (s->bank < s->bank_size) {
                set_bank (1, msg);
        } else {
@@ -1509,7 +1651,7 @@ OSC::transport_frame (lo_message msg)
        lo_message reply = lo_message_new ();
        lo_message_add_int64 (reply, pos);
 
-       lo_send_message (lo_message_get_source (msg), "/transport_frame", reply);
+       lo_send_message (get_address (msg), "/transport_frame", reply);
 
        lo_message_free (reply);
 }
@@ -1525,7 +1667,7 @@ OSC::transport_speed (lo_message msg)
        lo_message reply = lo_message_new ();
        lo_message_add_double (reply, ts);
 
-       lo_send_message (lo_message_get_source (msg), "/transport_speed", reply);
+       lo_send_message (get_address (msg), "/transport_speed", reply);
 
        lo_message_free (reply);
 }
@@ -1541,7 +1683,7 @@ OSC::record_enabled (lo_message msg)
        lo_message reply = lo_message_new ();
        lo_message_add_int32 (reply, re);
 
-       lo_send_message (lo_message_get_source (msg), "/record_enabled", reply);
+       lo_send_message (get_address (msg), "/record_enabled", reply);
 
        lo_message_free (reply);
 }
@@ -1563,16 +1705,12 @@ OSC::master_set_gain (float dB)
 }
 
 int
-OSC::master_set_fader (uint32_t position)
+OSC::master_set_fader (float position)
 {
        if (!session) return -1;
        boost::shared_ptr<Stripable> s = session->master_out();
        if (s) {
-               if ((position > 799.5) && (position < 800.5)) {
-                       s->gain_control()->set_value (1.0, PBD::Controllable::NoGroup);
-               } else {
-                       s->gain_control()->set_value (slider_position_to_gain_with_max (((float)position/1023), 2.0), PBD::Controllable::NoGroup);
-               }
+               s->gain_control()->set_value (slider_position_to_gain_with_max (position, 2.0), PBD::Controllable::NoGroup);
        }
        return 0;
 }
@@ -1600,17 +1738,17 @@ OSC::master_set_pan_stereo_position (float position, lo_message msg)
 
        if (s) {
                if (s->pan_azimuth_control()) {
-                       s->pan_azimuth_control()->set_value (position, PBD::Controllable::NoGroup);
-                       endposition = s->pan_azimuth_control()->get_value ();
+                       s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (position), PBD::Controllable::NoGroup);
+                       endposition = s->pan_azimuth_control()->internal_to_interface (s->pan_azimuth_control()->get_value ());
                }
        }
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
 
        if (sur->feedback[4]) {
                lo_message reply = lo_message_new ();
                lo_message_add_float (reply, endposition);
 
-               lo_send_message (lo_message_get_source (msg), "/master/pan_stereo_position", reply);
+               lo_send_message (get_address (msg), "/master/pan_stereo_position", reply);
                lo_message_free (reply);
        }
 
@@ -1648,17 +1786,122 @@ OSC::monitor_set_gain (float dB)
 }
 
 int
-OSC::monitor_set_fader (uint32_t position)
+OSC::monitor_set_fader (float position)
 {
        if (!session) return -1;
        boost::shared_ptr<Stripable> s = session->monitor_out();
        if (s) {
-               if ((position > 799.5) && (position < 800.5)) {
-                       s->gain_control()->set_value (1.0, PBD::Controllable::NoGroup);
-               } else {
-                       s->gain_control()->set_value (slider_position_to_gain_with_max (((float)position/1023), 2.0), PBD::Controllable::NoGroup);
+               s->gain_control()->set_value (slider_position_to_gain_with_max (position, 2.0), PBD::Controllable::NoGroup);
+       }
+       return 0;
+}
+
+int
+OSC::route_get_sends(lo_message msg) {
+       if (!session) {
+               return -1;
+       }
+
+       lo_arg **argv = lo_message_get_argv(msg);
+
+       int rid = argv[0]->i;
+
+       boost::shared_ptr<Stripable> strip = get_strip(rid, get_address(msg));
+       if (!strip) {
+               return -1;
+       }
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (strip);
+       if (!r) {
+               return -1;
+       }
+
+       lo_message reply = lo_message_new();
+       lo_message_add_int32(reply, rid);
+
+       int i = 0;
+       for (;;) {
+               boost::shared_ptr<Processor> p = r->nth_send(i++);
+
+               if (!p) {
+                       break;
+               }
+
+               boost::shared_ptr<InternalSend> isend = boost::dynamic_pointer_cast<InternalSend> (p);
+               if (isend) {
+                       lo_message_add_int32(reply, get_sid(isend->target_route(), get_address(msg)));
+                       lo_message_add_string(reply, isend->name().c_str());
+                       lo_message_add_int32(reply, i);
+                       boost::shared_ptr<Amp> a = isend->amp();
+                       lo_message_add_float(reply, gain_to_slider_position(a->gain_control()->get_value()));
+                       lo_message_add_int32(reply, p->active() ? 1 : 0);
+               }
+       }
+       // if used dedicated message path to identify this reply in async operation. Naming it #reply wont help the client to identify the content.
+       lo_send_message(get_address (msg), "/strip/sends", reply);
+
+       lo_message_free(reply);
+
+       return 0;
+}
+
+int
+OSC::route_get_receives(lo_message msg) {
+       if (!session) {
+               return -1;
+       }
+
+       lo_arg **argv = lo_message_get_argv(msg);
+
+       uint32_t rid = argv[0]->i;
+
+
+       boost::shared_ptr<Stripable> strip = get_strip(rid, get_address(msg));
+       if (!strip) {
+               return -1;
+       }
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (strip);
+       if (!r) {
+               return -1;
+       }
+
+       boost::shared_ptr<RouteList> route_list = session->get_routes();
+
+       lo_message reply = lo_message_new();
+
+       for (RouteList::iterator i = route_list->begin(); i != route_list->end(); ++i) {
+               boost::shared_ptr<Route> tr = boost::dynamic_pointer_cast<Route> (*i);
+               if (!tr) {
+                       continue;
+               }
+               int j = 0;
+
+               for (;;) {
+                       boost::shared_ptr<Processor> p = tr->nth_send(j++);
+
+                       if (!p) {
+                               break;
+                       }
+
+                       boost::shared_ptr<InternalSend> isend = boost::dynamic_pointer_cast<InternalSend> (p);
+                       if (isend) {
+                               if( isend->target_route()->id() == r->id()){
+                                       boost::shared_ptr<Amp> a = isend->amp();
+
+                                       lo_message_add_int32(reply, get_sid(tr, get_address(msg)));
+                                       lo_message_add_string(reply, tr->name().c_str());
+                                       lo_message_add_int32(reply, j);
+                                       lo_message_add_float(reply, gain_to_slider_position(a->gain_control()->get_value()));
+                                       lo_message_add_int32(reply, p->active() ? 1 : 0);
+                               }
+                       }
                }
        }
+
+       // I have used a dedicated message path to identify this reply in async operation. Naming it #reply wont help the client to identify the content.
+       lo_send_message(get_address (msg), "/strip/receives", reply);
+       lo_message_free(reply);
        return 0;
 }
 
@@ -1667,7 +1910,7 @@ int
 OSC::route_mute (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->mute_control()) {
@@ -1676,16 +1919,16 @@ OSC::route_mute (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("mute", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("mute", ssid, 0, get_address (msg));
 }
 
 int
 OSC::sel_mute (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1695,14 +1938,14 @@ OSC::sel_mute (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("mute", 0, lo_message_get_source (msg));
+       return sel_fail ("mute", 0, get_address (msg));
 }
 
 int
 OSC::route_solo (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->solo_control()) {
@@ -1711,14 +1954,14 @@ OSC::route_solo (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("solo", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("solo", ssid, 0, get_address (msg));
 }
 
 int
 OSC::route_solo_iso (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->solo_isolate_control()) {
@@ -1727,7 +1970,7 @@ OSC::route_solo_iso (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("solo_iso", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("solo_iso", ssid, 0, get_address (msg));
 }
 
 int
@@ -1743,16 +1986,16 @@ OSC::route_solo_safe (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("solo_safe", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("solo_safe", ssid, 0, get_address (msg));
 }
 
 int
 OSC::sel_solo (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1762,16 +2005,16 @@ OSC::sel_solo (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("solo", 0, lo_message_get_source (msg));
+       return sel_fail ("solo", 0, get_address (msg));
 }
 
 int
 OSC::sel_solo_iso (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1781,16 +2024,16 @@ OSC::sel_solo_iso (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("solo_iso", 0, lo_message_get_source (msg));
+       return sel_fail ("solo_iso", 0, get_address (msg));
 }
 
 int
 OSC::sel_solo_safe (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1800,16 +2043,16 @@ OSC::sel_solo_safe (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("solo_safe", 0, lo_message_get_source (msg));
+       return sel_fail ("solo_safe", 0, get_address (msg));
 }
 
 int
 OSC::sel_recenable (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1819,14 +2062,14 @@ OSC::sel_recenable (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("recenable", 0, lo_message_get_source (msg));
+       return sel_fail ("recenable", 0, get_address (msg));
 }
 
 int
 OSC::route_recenable (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->rec_enable_control()) {
@@ -1836,16 +2079,31 @@ OSC::route_recenable (int ssid, int yn, lo_message msg)
                        }
                }
        }
-       return route_send_fail ("recenable", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("recenable", ssid, 0, get_address (msg));
+}
+
+int
+OSC::route_rename(int ssid, char *newname, lo_message msg) {
+    if (!session) {
+        return -1;
+    }
+
+    boost::shared_ptr<Stripable> s = get_strip(ssid, get_address(msg));
+
+    if (s) {
+        s->set_name(std::string(newname));
+    }
+
+    return 0;
 }
 
 int
 OSC::sel_recsafe (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1855,14 +2113,14 @@ OSC::sel_recsafe (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("record_safe", 0, lo_message_get_source (msg));
+       return sel_fail ("record_safe", 0, get_address (msg));
 }
 
 int
 OSC::route_recsafe (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
        if (s) {
                if (s->rec_safe_control()) {
                        s->rec_safe_control()->set_value (yn, PBD::Controllable::UseGroup);
@@ -1871,14 +2129,14 @@ OSC::route_recsafe (int ssid, int yn, lo_message msg)
                        }
                }
        }
-       return route_send_fail ("record_safe", ssid, 0,lo_message_get_source (msg));
+       return route_send_fail ("record_safe", ssid, 0,get_address (msg));
 }
 
 int
 OSC::route_monitor_input (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
@@ -1890,16 +2148,16 @@ OSC::route_monitor_input (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("monitor_input", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("monitor_input", ssid, 0, get_address (msg));
 }
 
 int
 OSC::sel_monitor_input (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1912,14 +2170,14 @@ OSC::sel_monitor_input (uint32_t yn, lo_message msg)
                        }
                }
        }
-       return sel_fail ("monitor_input", 0, lo_message_get_source (msg));
+       return sel_fail ("monitor_input", 0, get_address (msg));
 }
 
 int
 OSC::route_monitor_disk (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
@@ -1931,16 +2189,16 @@ OSC::route_monitor_disk (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("monitor_disk", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("monitor_disk", ssid, 0, get_address (msg));
 }
 
 int
 OSC::sel_monitor_disk (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1953,7 +2211,7 @@ OSC::sel_monitor_disk (uint32_t yn, lo_message msg)
                        }
                }
        }
-       return sel_fail ("monitor_disk", 0, lo_message_get_source (msg));
+       return sel_fail ("monitor_disk", 0, get_address (msg));
 }
 
 
@@ -1961,7 +2219,7 @@ int
 OSC::strip_phase (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->phase_control()) {
@@ -1970,16 +2228,16 @@ OSC::strip_phase (int ssid, int yn, lo_message msg)
                }
        }
 
-       return route_send_fail ("polarity", ssid, 0, lo_message_get_source (msg));
+       return route_send_fail ("polarity", ssid, 0, get_address (msg));
 }
 
 int
 OSC::sel_phase (uint32_t yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -1989,23 +2247,23 @@ OSC::sel_phase (uint32_t yn, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("polarity", 0, lo_message_get_source (msg));
+       return sel_fail ("polarity", 0, get_address (msg));
 }
 
 int
 OSC::strip_expand (int ssid, int yn, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        sur->expand_enable = (bool) yn;
        sur->expand = ssid;
        boost::shared_ptr<Stripable> s;
        if (yn) {
-               s = get_strip (ssid, lo_message_get_source (msg));
+               s = get_strip (ssid, get_address (msg));
        } else {
                s = ControlProtocol::first_selected_stripable();
        }
 
-       return _strip_select (s, lo_message_get_source (msg));
+       return _strip_select (s, get_address (msg));
 }
 
 int
@@ -2088,16 +2346,16 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
        if (!yn) return 0;
 
        if (!session) {
-               route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
+               route_send_fail ("select", ssid, 0, get_address (msg));
                return -1;
        }
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        sur->expand_enable = false;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
        if (s) {
                SetStripableSelection (s);
        } else {
-               route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
+               route_send_fail ("select", ssid, 0, get_address (msg));
        }
 
        return 0;
@@ -2106,23 +2364,23 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
 int
 OSC::sel_expand (uint32_t state, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        sur->expand_enable = (bool) state;
        if (state && sur->expand) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = ControlProtocol::first_selected_stripable();
        }
 
-       return _strip_select (s, lo_message_get_source (msg));
+       return _strip_select (s, get_address (msg));
 }
 
 int
 OSC::route_set_gain_abs (int ssid, float level, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->gain_control()) {
@@ -2141,7 +2399,7 @@ int
 OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
 {
        if (!session) {
-               route_send_fail ("gain", ssid, -193, lo_message_get_source (msg));
+               route_send_fail ("gain", ssid, -193, get_address (msg));
                return -1;
        }
        int ret;
@@ -2151,7 +2409,7 @@ OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
                ret = route_set_gain_abs (ssid, dB_to_coefficient (dB), msg);
        }
        if (ret != 0) {
-               return route_send_fail ("gain", ssid, -193, lo_message_get_source (msg));
+               return route_send_fail ("gain", ssid, -193, get_address (msg));
        }
        return 0;
 }
@@ -2159,10 +2417,10 @@ OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
 int
 OSC::sel_gain (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -2178,24 +2436,20 @@ OSC::sel_gain (float val, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("gain", -193, lo_message_get_source (msg));
+       return sel_fail ("gain", -193, get_address (msg));
 }
 
 int
 OSC::route_set_gain_fader (int ssid, float pos, lo_message msg)
 {
        if (!session) {
-               route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
+               route_send_fail ("fader", ssid, 0, get_address (msg));
                return -1;
        }
        int ret;
-       if ((pos > 799.5) && (pos < 800.5)) {
-               ret = route_set_gain_abs (ssid, 1.0, msg);
-       } else {
-               ret = route_set_gain_abs (ssid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
-       }
+       ret = route_set_gain_abs (ssid, slider_position_to_gain_with_max (pos, 2.0), msg);
        if (ret != 0) {
-               return route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
+               return route_send_fail ("fader", ssid, 0, get_address (msg));
        }
        return 0;
 }
@@ -2203,33 +2457,29 @@ OSC::route_set_gain_fader (int ssid, float pos, lo_message msg)
 int
 OSC::sel_fader (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                float abs;
-               if ((val > 799.5) && (val < 800.5)) {
-                       abs = 1.0;
-               } else {
-                       abs = slider_position_to_gain_with_max ((val/1023), 2.0);
-               }
+               abs = slider_position_to_gain_with_max (val, 2.0);
                if (s->gain_control()) {
                        s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("fader", 0, lo_message_get_source (msg));
+       return sel_fail ("fader", 0, get_address (msg));
 }
 
 int
 OSC::route_set_trim_abs (int ssid, float level, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->trim_control()) {
@@ -2248,7 +2498,7 @@ OSC::route_set_trim_dB (int ssid, float dB, lo_message msg)
        int ret;
        ret = route_set_trim_abs(ssid, dB_to_coefficient (dB), msg);
        if (ret != 0) {
-               return route_send_fail ("trimdB", ssid, 0, lo_message_get_source (msg));
+               return route_send_fail ("trimdB", ssid, 0, get_address (msg));
        }
 
 return 0;
@@ -2257,10 +2507,10 @@ return 0;
 int
 OSC::sel_trim (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -2270,69 +2520,69 @@ OSC::sel_trim (float val, lo_message msg)
                        return 0;
                }
        }
-       return sel_fail ("trimdB", 0, lo_message_get_source (msg));
+       return sel_fail ("trimdB", 0, get_address (msg));
 }
 
 int
 OSC::sel_pan_position (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if(s->pan_azimuth_control()) {
-                       s->pan_azimuth_control()->set_value (val, PBD::Controllable::NoGroup);
-                       //return route_send_fail ("pan_stereo_position", ssid, s->pan_azimuth_control()->get_value (), lo_message_get_source (msg));
+                       s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+                       return sel_fail ("pan_stereo_position", s->pan_azimuth_control()->internal_to_interface (s->pan_azimuth_control()->get_value ()), get_address (msg));
                        return 0;
                }
        }
-       return sel_fail ("pan_stereo_position", 0.5, lo_message_get_source (msg));
+       return sel_fail ("pan_stereo_position", 0.5, get_address (msg));
 }
 
 int
 OSC::sel_pan_width (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->pan_width_control()) {
-                       s->pan_width_control()->set_value (val, PBD::Controllable::NoGroup);
+                       s->pan_width_control()->set_value (s->pan_width_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("pan_stereo_width", 1, lo_message_get_source (msg));
+       return sel_fail ("pan_stereo_width", 1, get_address (msg));
 }
 
 int
 OSC::route_set_pan_stereo_position (int ssid, float pos, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if(s->pan_azimuth_control()) {
-                       s->pan_azimuth_control()->set_value (pos, PBD::Controllable::NoGroup);
-                       return route_send_fail ("pan_stereo_position", ssid, s->pan_azimuth_control()->get_value (), lo_message_get_source (msg));
+                       s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (pos), PBD::Controllable::NoGroup);
+                       return route_send_fail ("pan_stereo_position", ssid, s->pan_azimuth_control()->internal_to_interface (s->pan_azimuth_control()->get_value ()), get_address (msg));
                }
        }
 
-       return route_send_fail ("pan_stereo_position", ssid, 0.5, lo_message_get_source (msg));
+       return route_send_fail ("pan_stereo_position", ssid, 0.5, get_address (msg));
 }
 
 int
 OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg)
 {
        if (!session) return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
                if (s->pan_width_control()) {
@@ -2341,110 +2591,125 @@ OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg)
                }
        }
 
-       return route_send_fail ("pan_stereo_width", ssid, 1, lo_message_get_source (msg));
+       return route_send_fail ("pan_stereo_width", ssid, 1, get_address (msg));
 }
 
 int
-OSC::route_set_send_gain_abs (int ssid, int sid, float val, lo_message msg)
+OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
 {
        if (!session) {
                return -1;
        }
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
-
-       if (!s) {
-               return -1;
-       }
-
-       /* revert to zero-based counting */
-
-       if (sid > 0) {
-               --sid;
-       }
-
-       if (s->send_level_controllable (sid)) {
-               s->send_level_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
-               return 0;
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+       float abs;
+       if (s) {
+               if (id > 0) {
+                       --id;
+               }
+#ifdef MIXBUS
+               abs = val;
+#else
+               if (val < -192) {
+                       abs = 0;
+               } else {
+                       abs = dB_to_coefficient (val);
+               }
+#endif
+               if (s->send_level_controllable (id)) {
+                       s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+                       return 0;
+               }
        }
-
-       return -1;
-}
-
-int
-OSC::route_set_send_gain_dB (int ssid, int sid, float val, lo_message msg)
-{
-       return route_set_send_gain_abs (ssid, sid, dB_to_coefficient (val), msg);
+       return 0;
 }
 
 int
-OSC::route_set_send_fader (int ssid, int sid, float pos, lo_message msg)
+OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg)
 {
        if (!session) {
                return -1;
        }
-       if ((pos > 799.5) && (pos < 800.5)) {
-               return route_set_send_gain_abs (ssid, sid, 1.0, msg);
-       } else {
-               return route_set_send_gain_abs (ssid, sid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+       float abs;
+       if (s) {
+
+               if (id > 0) {
+                       --id;
+               }
+
+               if (s->send_level_controllable (id)) {
+#ifdef MIXBUS
+                       abs = s->send_level_controllable(id)->interface_to_internal (val);
+#else
+                       abs = slider_position_to_gain_with_max (val, 2.0);
+#endif
+                       s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+                       return 0;
+               }
        }
+       return 0;
 }
 
 int
 OSC::sel_sendgain (int id, float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        float abs;
        if (s) {
+               if (id > 0) {
+                       --id;
+               }
+#ifdef MIXBUS
+               abs = val;
+#else
                if (val < -192) {
                        abs = 0;
                } else {
                        abs = dB_to_coefficient (val);
                }
-               if (id > 0) {
-                       --id;
-               }
-
+#endif
                if (s->send_level_controllable (id)) {
                        s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_send_fail ("send_gain", id, -193, lo_message_get_source (msg));
+       return sel_send_fail ("send_gain", id + 1, -193, get_address (msg));
 }
 
 int
 OSC::sel_sendfader (int id, float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        float abs;
        if (s) {
-               if ((val > 799.5) && (val < 800.5)) {
-                       abs = 1.0;
-               } else {
-                       abs = slider_position_to_gain_with_max ((val/1023), 2.0);
-               }
+
                if (id > 0) {
                        --id;
                }
 
                if (s->send_level_controllable (id)) {
+#ifdef MIXBUS
+                       abs = s->send_level_controllable(id)->interface_to_internal (val);
+#else
+                       abs = slider_position_to_gain_with_max (val, 2.0);
+#endif
                        s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_send_fail ("send_gain", id, 0, lo_message_get_source (msg));
+       return sel_send_fail ("send_fader", id, 0, get_address (msg));
 }
 
 int
@@ -2453,7 +2718,7 @@ OSC::route_set_send_enable (int ssid, int sid, float val, lo_message msg)
        if (!session) {
                return -1;
        }
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        if (s) {
 
@@ -2469,6 +2734,18 @@ OSC::route_set_send_enable (int ssid, int sid, float val, lo_message msg)
                }
 
                if (s->send_level_controllable (sid)) {
+                       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+                       if (!r) {
+                               return 0;
+                       }
+                       boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(sid));
+                       if (snd) {
+                               if (val) {
+                                       snd->activate();
+                               } else {
+                                       snd->deactivate();
+                               }
+                       }
                        return 0;
                }
 
@@ -2480,10 +2757,10 @@ OSC::route_set_send_enable (int ssid, int sid, float val, lo_message msg)
 int
 OSC::sel_sendenable (int id, float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
@@ -2496,18 +2773,195 @@ OSC::sel_sendenable (int id, float val, lo_message msg)
                        return 0;
                }
                if (s->send_level_controllable (id)) {
-                       return sel_send_fail ("send_enable", id + 1, 1, lo_message_get_source (msg));
+                       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+                       if (!r) {
+                               // should never get here
+                               return sel_send_fail ("send_enable", id + 1, 0, get_address (msg));
+                       }
+                       boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(id));
+                       if (snd) {
+                               if (val) {
+                                       snd->activate();
+                               } else {
+                                       snd->deactivate();
+                               }
+                       }
+                       return 0;
                }
        }
-       return sel_send_fail ("send_enable", id + 1, 0, lo_message_get_source (msg));
+       return sel_send_fail ("send_enable", id + 1, 0, get_address (msg));
 }
 
 int
-OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message msg)
-{
+OSC::route_plugin_list(int ssid, lo_message msg) {
+       if (!session) {
+               return -1;
+       }
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (get_strip(ssid, get_address(msg)));
+
+       if (!r) {
+               PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+       int piid = 0;
+
+       lo_message reply = lo_message_new();
+       lo_message_add_int32(reply, ssid);
+
+
+       for(;;) {
+               boost::shared_ptr<Processor> redi = r->nth_plugin(piid);
+               if( !redi ) {
+                       break;
+               }
+
+               boost::shared_ptr<PluginInsert> pi;
+
+               if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+                       PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
+                       continue;
+               }
+               lo_message_add_int32(reply, piid);
+
+               boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+               lo_message_add_string(reply, pip->name());
+
+               piid++;
+       }
+
+       lo_send_message(get_address (msg), "/strip/plugin/list", reply);
+       lo_message_free(reply);
+       return 0;
+}
+
+int
+OSC::route_plugin_descriptor(int ssid, int piid, lo_message msg) {
+       if (!session) {
+               return -1;
+       }
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (get_strip(ssid, get_address(msg)));
+
+       if (!r) {
+               PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<Processor> redi = r->nth_plugin(piid);
+
+       if (!redi) {
+               PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<PluginInsert> pi;
+
+       if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+               PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+       bool ok = false;
+
+       lo_message reply = lo_message_new();
+       lo_message_add_int32(reply, ssid);
+       lo_message_add_int32(reply, piid);
+       lo_message_add_string(reply, pip->name());
+       for( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) {
+
+               uint32_t controlid = pip->nth_parameter(ppi, ok);
+               if (!ok) {
+                       continue;
+               }
+               if( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) {
+                       boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
+
+                               lo_message_add_int32(reply, ppi);
+                               ParameterDescriptor pd;
+                               pi->plugin()->get_parameter_descriptor(controlid, pd);
+                               lo_message_add_string(reply, pd.label.c_str());
+
+                               // I've combined those binary descriptor parts in a bit-field to reduce lilo message elements
+                               int flags = 0;
+                               flags |= pd.enumeration ? 1 : 0;
+                               flags |= pd.integer_step ? 2 : 0;
+                               flags |= pd.logarithmic ? 4 : 0;
+                               flags |= pd.max_unbound ? 8 : 0;
+                               flags |= pd.min_unbound ? 16 : 0;
+                               flags |= pd.sr_dependent ? 32 : 0;
+                               flags |= pd.toggled ? 64 : 0;
+                               flags |= c != NULL ? 128 : 0; // bit 7 indicates in input control
+                               lo_message_add_int32(reply, flags);
+
+                               lo_message_add_int32(reply, pd.datatype);
+                               lo_message_add_float(reply, pd.lower);
+                               lo_message_add_float(reply, pd.upper);
+                               lo_message_add_string(reply, pd.print_fmt.c_str());
+                               if( pd.scale_points ) {
+                                       lo_message_add_int32(reply, pd.scale_points->size());
+                                       for( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) {
+                                               lo_message_add_int32(reply, i->second);
+                                               lo_message_add_string(reply, ((std::string)i->first).c_str());
+                                       }
+                               }
+                               else {
+                                       lo_message_add_int32(reply, 0);
+                               }
+                               if( c ) {
+                                       lo_message_add_double(reply, c->get_value());
+                               }
+                               else {
+                                       lo_message_add_double (reply, 0);
+                       }
+               }
+       }
+
+       lo_send_message (get_address (msg), "/strip/plugin/descriptor", reply);
+       lo_message_free (reply);
+
+       return 0;
+}
+
+int
+OSC::route_plugin_reset(int ssid, int piid, lo_message msg) {
+       if (!session) {
+               return -1;
+       }
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (get_strip(ssid, get_address(msg)));
+
+       if (!r) {
+               PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<Processor> redi = r->nth_plugin(piid);
+
+       if (!redi) {
+               PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<PluginInsert> pi;
+
+       if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+               PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
+               return -1;
+       }
+
+       pi->reset_parameters_to_default();
+
+       return 0;
+}
+
+int
+OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message msg)
+{
        if (!session)
                return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
 
@@ -2568,7 +3022,7 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
        if (!session) {
                return -1;
        }
-       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
 
        boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
 
@@ -2611,177 +3065,355 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
        return 0;
 }
 
+int
+OSC::route_plugin_activate (int ssid, int piid, lo_message msg)
+{
+       if (!session)
+               return -1;
+       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+
+       if (!r) {
+               PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<Processor> redi=r->nth_plugin (piid);
+
+       if (!redi) {
+               PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<PluginInsert> pi;
+
+       if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+               PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+       pi->activate();
+
+       return 0;
+}
+
+int
+OSC::route_plugin_deactivate (int ssid, int piid, lo_message msg)
+{
+       if (!session)
+               return -1;
+       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+
+       if (!r) {
+               PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<Processor> redi=r->nth_plugin (piid);
+
+       if (!redi) {
+               PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << ssid << "'" << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<PluginInsert> pi;
+
+       if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+               PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
+               return -1;
+       }
+
+       boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+       pi->deactivate();
+
+       return 0;
+}
+
 // select
 
 int
 OSC::sel_pan_elevation (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->pan_elevation_control()) {
-                       s->pan_elevation_control()->set_value (val, PBD::Controllable::NoGroup);
+                       s->pan_elevation_control()->set_value (s->pan_elevation_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("pan_elevation_position", 0.5, lo_message_get_source (msg));
+       return sel_fail ("pan_elevation_position", 0, get_address (msg));
 }
 
 int
 OSC::sel_pan_frontback (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->pan_frontback_control()) {
-                       s->pan_frontback_control()->set_value (val, PBD::Controllable::NoGroup);
+                       s->pan_frontback_control()->set_value (s->pan_frontback_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("pan_frontback_position", 0.5, lo_message_get_source (msg));
+       return sel_fail ("pan_frontback_position", 0.5, get_address (msg));
 }
 
 int
 OSC::sel_pan_lfe (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->pan_lfe_control()) {
-                       s->pan_lfe_control()->set_value (val, PBD::Controllable::NoGroup);
+                       s->pan_lfe_control()->set_value (s->pan_lfe_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("pan_lfe_position", 0, lo_message_get_source (msg));
+       return sel_fail ("pan_lfe_control", 0, get_address (msg));
 }
 
+// compressor control
 int
 OSC::sel_comp_enable (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->comp_enable_controllable()) {
-                       s->comp_enable_controllable()->set_value (val, PBD::Controllable::NoGroup);
+                       s->comp_enable_controllable()->set_value (s->comp_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("comp_enable", 0, lo_message_get_source (msg));
+       return sel_fail ("comp_enable", 0, get_address (msg));
 }
 
 int
 OSC::sel_comp_threshold (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->comp_threshold_controllable()) {
-                       s->comp_threshold_controllable()->set_value (val, PBD::Controllable::NoGroup);
+                       s->comp_threshold_controllable()->set_value (s->comp_threshold_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("comp_threshold", 0, lo_message_get_source (msg));
+       return sel_fail ("comp_threshold", 0, get_address (msg));
 }
 
 int
 OSC::sel_comp_speed (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->comp_speed_controllable()) {
-                       s->comp_speed_controllable()->set_value (val, PBD::Controllable::NoGroup);
+                       s->comp_speed_controllable()->set_value (s->comp_speed_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("comp_speed", 0, lo_message_get_source (msg));
+       return sel_fail ("comp_speed", 0, get_address (msg));
 }
 
 int
 OSC::sel_comp_mode (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->comp_mode_controllable()) {
-                       s->comp_mode_controllable()->set_value (val, PBD::Controllable::NoGroup);
+                       s->comp_mode_controllable()->set_value (s->comp_mode_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("comp_mode", 0, lo_message_get_source (msg));
+       return sel_fail ("comp_mode", 0, get_address (msg));
 }
 
 int
 OSC::sel_comp_makeup (float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
                if (s->comp_makeup_controllable()) {
-                       s->comp_makeup_controllable()->set_value (val, PBD::Controllable::NoGroup);
+                       s->comp_makeup_controllable()->set_value (s->comp_makeup_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("comp_makeup", 0, get_address (msg));
+}
+
+// EQ control
+
+int
+OSC::sel_eq_enable (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(get_address (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, get_address (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->eq_enable_controllable()) {
+                       s->eq_enable_controllable()->set_value (s->eq_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("eq_enable", 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_hpf (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(get_address (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, get_address (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->eq_hpf_controllable()) {
+                       s->eq_hpf_controllable()->set_value (s->eq_hpf_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("comp_makeup", 0, lo_message_get_source (msg));
+       return sel_fail ("eq_hpf", 0, get_address (msg));
 }
 
 int
-OSC::sel_comp_redux (float val, lo_message msg)
+OSC::sel_eq_gain (int id, float val, lo_message msg)
 {
-       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       OSCSurface *sur = get_surface(get_address (msg));
        boost::shared_ptr<Stripable> s;
        if (sur->expand_enable) {
-               s = get_strip (sur->expand, lo_message_get_source (msg));
+               s = get_strip (sur->expand, get_address (msg));
        } else {
                s = _select;
        }
        if (s) {
-               if (s->comp_redux_controllable()) {
-                       s->comp_redux_controllable()->set_value (val, PBD::Controllable::NoGroup);
+               if (id > 0) {
+                       --id;
+               }
+               if (s->eq_gain_controllable (id)) {
+                       s->eq_gain_controllable (id)->set_value (s->eq_gain_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
                        return 0;
                }
        }
-       return sel_fail ("comp_redux", 0, lo_message_get_source (msg));
+       return sel_send_fail ("eq_gain", id + 1, 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_freq (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(get_address (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, get_address (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (id > 0) {
+                       --id;
+               }
+               if (s->eq_freq_controllable (id)) {
+                       s->eq_freq_controllable (id)->set_value (s->eq_freq_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_send_fail ("eq_freq", id + 1, 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_q (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(get_address (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, get_address (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (id > 0) {
+                       --id;
+               }
+               if (s->eq_q_controllable (id)) {
+                       s->eq_q_controllable (id)->set_value (s->eq_q_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_send_fail ("eq_q", id + 1, 0, get_address (msg));
+}
+
+int
+OSC::sel_eq_shape (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(get_address (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, get_address (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (id > 0) {
+                       --id;
+               }
+               if (s->eq_shape_controllable (id)) {
+                       s->eq_shape_controllable (id)->set_value (s->eq_shape_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_send_fail ("eq_shape", id + 1, 0, get_address (msg));
 }
 
 void
@@ -2807,6 +3439,15 @@ OSC::periodic (void)
 {
        if (!tick) {
                Glib::usleep(100); // let flurry of signals subside
+               if (global_init) {
+                       for (uint32_t it = 0; it < _surface.size(); it++) {
+                               OSCSurface* sur = &_surface[it];
+                               lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
+                               global_feedback (sur->feedback, addr, sur->gainmode);
+                       }
+                       global_init = false;
+                       tick = true;
+               }
                if (bank_dirty) {
                        _recalcbanks ();
                        bank_dirty = false;
@@ -2917,6 +3558,26 @@ OSC::get_state ()
 {
        XMLNode& node (ControlProtocol::get_state());
        node.add_property("debugmode", (int) _debugmode); // TODO: enum2str
+       node.add_property ("address-only", address_only);
+       node.add_property ("remote-port", remote_port);
+       node.add_property ("banksize", default_banksize);
+       node.add_property ("striptypes", default_strip);
+       node.add_property ("feedback", default_feedback);
+       node.add_property ("gainmode", default_gainmode);
+       if (_surface.size()) {
+               XMLNode* config = new XMLNode (X_("Configurations"));
+               for (uint32_t it = 0; it < _surface.size(); ++it) {
+                       OSCSurface* sur = &_surface[it];
+                       XMLNode* devnode = new XMLNode (X_("Configuration"));
+                       devnode->add_property (X_("url"), sur->remote_url);
+                       devnode->add_property (X_("bank-size"), sur->bank_size);
+                       devnode->add_property (X_("strip-types"), sur->strip_types.to_ulong());
+                       devnode->add_property (X_("feedback"), sur->feedback.to_ulong());
+                       devnode->add_property (X_("gainmode"), sur->gainmode);
+                       config->add_child_nocopy (*devnode);
+               }
+               node.add_child_nocopy (*config);
+       }
        return node;
 }
 
@@ -2930,6 +3591,68 @@ OSC::set_state (const XMLNode& node, int version)
        if (p) {
                _debugmode = OSCDebugMode (PBD::atoi(p->value ()));
        }
+       p = node.property (X_("address-only"));
+       if (p) {
+               address_only = OSCDebugMode (PBD::atoi(p->value ()));
+       }
+       p = node.property (X_("remote-port"));
+       if (p) {
+               remote_port = p->value ();
+       }
+       p = node.property (X_("banksize"));
+       if (p) {
+               default_banksize = OSCDebugMode (PBD::atoi(p->value ()));
+       }
+       p = node.property (X_("striptypes"));
+       if (p) {
+               default_strip = OSCDebugMode (PBD::atoi(p->value ()));
+       }
+       p = node.property (X_("feedback"));
+       if (p) {
+               default_feedback = OSCDebugMode (PBD::atoi(p->value ()));
+       }
+       p = node.property (X_("gainmode"));
+       if (p) {
+               default_gainmode = OSCDebugMode (PBD::atoi(p->value ()));
+       }
+       XMLNode* cnode = node.child (X_("Configurations"));
+
+       if (cnode) {
+               XMLNodeList const& devices = cnode->children();
+               for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
+                       XMLProperty const * prop = (*d)->property (X_("url"));
+                       if (prop) {
+                               OSCSurface s;
+                               bank_dirty = true;
+                               s.remote_url = prop->value();
+                               prop = (*d)->property (X_("bank-size"));
+                               if (prop) {
+                                       s.bank_size = atoi (prop->value().c_str());
+                               }
+                               prop = (*d)->property (X_("strip-types"));
+                               if (prop) {
+                                       s.strip_types = atoi (prop->value().c_str());
+                               }
+                               prop = (*d)->property (X_("feedback"));
+                               if (prop) {
+                                       s.feedback = atoi (prop->value().c_str());
+                               }
+                               prop = (*d)->property (X_("gainmode"));
+                               if (prop) {
+                                       s.gainmode = atoi (prop->value().c_str());
+                               }
+                               s.bank = 1;
+                               s.sel_obs = 0;
+                               s.expand = 0;
+                               s.expand_enable = false;
+                               s.strips = get_sorted_stripables(s.strip_types);
+                               s.nstrips = s.strips.size();
+                               _surface.push_back (s);
+                       }
+               }
+       }
+       global_init = true;
+       tick = false;
 
        return 0;
 }
@@ -2977,8 +3700,20 @@ OSC::get_sorted_stripables(std::bitset<32> types)
                        if (types[1] && (s->presentation_info().flags() & PresentationInfo::MidiTrack)) {
                                sorted.push_back (s);
                        } else
-                       if (types[2] && (s->presentation_info().flags() & PresentationInfo::AudioBus)) {
-                               sorted.push_back (s);
+                       if ((s->presentation_info().flags() & PresentationInfo::AudioBus)) {
+                               boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+                               // r->feeds (session->master_out()) may make more sense
+                               if (r->direct_feeds_according_to_reality (session->master_out())) {
+                                       // this is a bus
+                                       if (types[2]) {
+                                               sorted.push_back (s);
+                                       }
+                               } else {
+                                       // this is an Aux out
+                                       if (types[7]) {
+                                               sorted.push_back (s);
+                                       }
+                               }
                        } else
                        if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
                                sorted.push_back (s);