OSC: Add Talent individual monitor controls
[ardour.git] / libs / surfaces / osc / osc.cc
index 7e2b7e69a7c0ed8d8f219d8e502e5cdf5745de8b..39e61bece5f5b78a9c3f88f72106004b80b29e43 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,6 +57,7 @@
 #include "osc_controllable.h"
 #include "osc_route_observer.h"
 #include "osc_global_observer.h"
+#include "osc_cue_observer.h"
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
@@ -89,12 +91,11 @@ OSC::OSC (Session& s, uint32_t port)
        , _shutdown (false)
        , _osc_server (0)
        , _osc_unix_server (0)
-       , _send_route_changes (true)
        , _debugmode (Off)
        , address_only (false)
-       , remote_port ("3819")
+       , remote_port ("8000")
        , default_banksize (0)
-       , default_strip (31)
+       , default_strip (159)
        , default_feedback (0)
        , default_gainmode (0)
        , tick (true)
@@ -109,6 +110,7 @@ OSC::OSC (Session& s, uint32_t port)
 OSC::~OSC()
 {
        stop ();
+       tear_down_gui ();
        _instance = 0;
 }
 
@@ -162,19 +164,6 @@ OSC::get_active () const
        return _osc_server != 0;
 }
 
-int
-OSC::set_feedback (bool yn)
-{
-       _send_route_changes = yn;
-       return 0;
-}
-
-bool
-OSC::get_feedback () const
-{
-       return _send_route_changes;
-}
-
 int
 OSC::start ()
 {
@@ -340,6 +329,7 @@ OSC::stop ()
 
        periodic_connection.disconnect ();
        session_connections.drop_connections ();
+       cueobserver_connections.drop_connections ();
        // Delete any active route observers
        for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
@@ -364,6 +354,7 @@ OSC::stop ()
                        ++x;
                }
        }
+
 // delete select observers
        for (uint32_t it = 0; it < _surface.size(); ++it) {
                OSCSurface* sur = &_surface[it];
@@ -373,6 +364,19 @@ OSC::stop ()
                }
        }
 
+// delete cue observers
+       for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end();) {
+
+               OSCCueObserver* co;
+
+               if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
+                       delete *x;
+                       x = cue_observers.erase (x);
+               } else {
+                       ++x;
+               }
+       }
+
        return 0;
 }
 
@@ -593,9 +597,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/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);
@@ -658,6 +670,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)
 {
@@ -842,7 +860,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";
 
@@ -872,7 +897,8 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
 
                ret = 0;
 
-       } else if (strcmp (path, "/strip/ignore") == 0) {
+       } else
+       if (strcmp (path, "/strip/ignore") == 0) {
 
                for (int n = 0; n < argc; ++n) {
 
@@ -884,108 +910,109 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
                }
 
                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/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]->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]);
-                       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;
-               }
+       } 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;
@@ -1049,12 +1076,6 @@ OSC::debugmsg (const char *prefix, const char *path, const char* types, lo_arg *
        PBD::info << prefix << ": " << path << ss.str() << endmsg;
 }
 
-void
-OSC::update_clock ()
-{
-
-}
-
 // "Application Hook" Handlers //
 void
 OSC::session_loaded (Session& s)
@@ -1219,48 +1240,54 @@ OSC::refresh_surface (lo_message msg)
 {
        if (address_only) {
                // get rid of all surfaces and observers.
-               for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
+               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;
+}
 
-                       OSCRouteObserver* rc;
+void
+OSC::clear_devices ()
+{
+       for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
-                       if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
-                               delete *x;
-                               x = route_observers.erase (x);
-                       } else {
-                               ++x;
-                       }
+               OSCRouteObserver* rc;
+
+               if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+                       delete *x;
+                       x = route_observers.erase (x);
+               } else {
+                       ++x;
                }
-               // Should maybe do global_observers too
-               for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) {
+               // 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;
+               OSCGlobalObserver* gc;
 
-                       if ((gc = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
-                               delete *x;
-                               x = global_observers.erase (x);
-                       } else {
-                               ++x;
-                       }
+               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;
-                       }
+       }
+       // 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;
                }
-               // add one from msg + port - Nope get_surface will do that for us
-               // but we do want to clear out surfaces
-               _surface.clear();
        }
-       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;
+       // 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)
 {
@@ -1353,7 +1380,7 @@ OSC::get_surface (lo_address addr)
        s.remote_url = r_url;
        s.bank = 1;
        s.bank_size = default_banksize; // need to find out how many strips there are
-       s.strip_types = default_strip; // 31 is tracks, busses, and VCAs (no master/monitor)
+       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;
@@ -1431,7 +1458,11 @@ OSC::_recalcbanks ()
                OSCSurface* sur = &_surface[it];
                // find lo_address
                lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
-               _set_bank (sur->bank, addr);
+               if (sur->cue) {
+                       _cue_set (sur->aux, addr);
+               } else {
+                       _set_bank (sur->bank, addr);
+               }
        }
 }
 
@@ -1479,6 +1510,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);
@@ -1513,6 +1546,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
@@ -1762,6 +1797,115 @@ OSC::monitor_set_fader (float position)
        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;
+}
+
 // strip calls
 int
 OSC::route_mute (int ssid, int yn, lo_message msg)
@@ -1807,7 +1951,7 @@ OSC::route_solo (int ssid, int yn, lo_message msg)
        if (s) {
                if (s->solo_control()) {
                        s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
-                       return 0;
+                       return route_send_fail ("solo", ssid, (float) s->solo_control()->get_value(), get_address (msg));
                }
        }
 
@@ -1859,7 +2003,7 @@ OSC::sel_solo (uint32_t yn, lo_message msg)
        if (s) {
                if (s->solo_control()) {
                        s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
-                       return 0;
+                       return sel_fail ("solo", (float) s->solo_control()->get_value(), get_address (msg));
                }
        }
        return sel_fail ("solo", 0, get_address (msg));
@@ -1916,7 +2060,9 @@ OSC::sel_recenable (uint32_t yn, lo_message msg)
        if (s) {
                if (s->rec_enable_control()) {
                        s->rec_enable_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
-                       return 0;
+                       if (s->rec_enable_control()->get_value()) {
+                               return 0;
+                       }
                }
        }
        return sel_fail ("recenable", 0, get_address (msg));
@@ -1939,6 +2085,21 @@ OSC::route_recenable (int ssid, int yn, lo_message 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)
 {
@@ -1952,7 +2113,9 @@ OSC::sel_recsafe (uint32_t yn, lo_message msg)
        if (s) {
                if (s->rec_safe_control()) {
                        s->rec_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
-                       return 0;
+                       if (s->rec_safe_control()->get_value()) {
+                               return 0;
+                       }
                }
        }
        return sel_fail ("record_safe", 0, get_address (msg));
@@ -2119,21 +2282,25 @@ OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
                delete sur->sel_obs;
                sur->sel_obs = 0;
        }
-       if (s) {
+       bool feedback_on = sur->feedback.to_ulong();
+       if (s && feedback_on) {
                OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur->gainmode, sur->feedback);
                s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
                sur->sel_obs = sel_fb;
        } else if (sur->expand_enable) {
                sur->expand = 0;
                sur->expand_enable = false;
-               if (_select) {
+               if (_select && feedback_on) {
                        OSCSelectObserver* sel_fb = new OSCSelectObserver (_select, addr, sur->gainmode, sur->feedback);
                        _select->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
                        sur->sel_obs = sel_fb;
                }
-       } else {
+       } else if (feedback_on) {
                route_send_fail ("select", sur->expand, 0 , addr);
        }
+       if (!feedback_on) {
+               return 0;
+       }
        //update buttons on surface
        int b_s = sur->bank_size;
        if (!b_s) { // bank size 0 means we need to know how many strips there are.
@@ -2188,7 +2355,6 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
        if (!yn) return 0;
 
        if (!session) {
-               route_send_fail ("select", ssid, 0, get_address (msg));
                return -1;
        }
        OSCSurface *sur = get_surface(get_address (msg));
@@ -2197,7 +2363,9 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
        if (s) {
                SetStripableSelection (s);
        } else {
-               route_send_fail ("select", ssid, 0, get_address (msg));
+               if ((int) (sur->feedback.to_ulong())) {
+                       route_send_fail ("select", ssid, 0, get_address (msg));
+               }
        }
 
        return 0;
@@ -2576,6 +2744,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;
                }
 
@@ -2603,27 +2783,82 @@ 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, get_address (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, get_address (msg));
 }
 
 int
-OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message msg)
-{
-       if (!session)
+OSC::route_plugin_list (int ssid, lo_message msg) {
+       if (!session) {
                return -1;
-       boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+       }
 
-       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+       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 + 1);
+
+               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);
+       boost::shared_ptr<Processor> redi = r->nth_plugin(piid - 1);
 
        if (!redi) {
                PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << ssid << "'" << endmsg;
@@ -2638,13 +2873,135 @@ OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message
        }
 
        boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
-       bool ok=false;
+       bool ok = false;
 
-       uint32_t controlid = pip->nth_parameter (par,ok);
+       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++) {
 
-       if (!ok) {
-               PBD::error << "OSC: Cannot find parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "'" << endmsg;
-               return -1;
+               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 + 1);
+                               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 - 1);
+
+       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, get_address (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 - 1);
+
+       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;
+
+       uint32_t controlid = pip->nth_parameter (par - 1,ok);
+
+       if (!ok) {
+               PBD::error << "OSC: Cannot find parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "'" << endmsg;
+               return -1;
        }
 
        if (!pip->parameter_is_input(controlid)) {
@@ -2683,7 +3040,7 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
                return -1;
        }
 
-       boost::shared_ptr<Processor> redi=r->nth_processor (piid);
+       boost::shared_ptr<Processor> redi=r->nth_plugin (piid - 1);
 
        if (!redi) {
                return -1;
@@ -2698,7 +3055,7 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
        boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
        bool ok=false;
 
-       uint32_t controlid = pip->nth_parameter (par,ok);
+       uint32_t controlid = pip->nth_parameter (par - 1,ok);
 
        if (!ok) {
                return -1;
@@ -2709,8 +3066,12 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
        if (pi->plugin()->get_parameter_descriptor (controlid, pd) == 0) {
                boost::shared_ptr<AutomationControl> c = pi->automation_control (Evoral::Parameter(PluginAutomation, 0, controlid));
 
-               cerr << "parameter:     " << redi->describe_parameter(controlid)  << "\n";
-               cerr << "current value: " << c->get_value ();
+               cerr << "parameter:     " << pd.label  << "\n";
+               if (c) {
+                       cerr << "current value: " << c->get_value () << "\n";
+               } else {
+                       cerr << "current value not available, control does not exist\n";
+               }
                cerr << "lower value:   " << pd.lower << "\n";
                cerr << "upper value:   " << pd.upper << "\n";
        }
@@ -2718,6 +3079,74 @@ 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 - 1);
+
+       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 - 1);
+
+       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
@@ -3063,6 +3492,14 @@ OSC::periodic (void)
                        so->tick();
                }
        }
+       for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end(); x++) {
+
+               OSCCueObserver* co;
+
+               if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
+                       co->tick();
+               }
+       }
        return true;
 }
 
@@ -3143,8 +3580,8 @@ 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 ("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);
@@ -3176,13 +3613,13 @@ OSC::set_state (const XMLNode& node, int version)
        if (p) {
                _debugmode = OSCDebugMode (PBD::atoi(p->value ()));
        }
-       p = node.property (X_("address_only"));
+       p = node.property (X_("address-only"));
        if (p) {
                address_only = OSCDebugMode (PBD::atoi(p->value ()));
        }
-       p = node.property (X_("remote_port"));
+       p = node.property (X_("remote-port"));
        if (p) {
-               remote_port = OSCDebugMode (PBD::atoi(p->value ()));
+               remote_port = p->value ();
        }
        p = node.property (X_("banksize"));
        if (p) {
@@ -3285,8 +3722,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);
@@ -3313,3 +3762,297 @@ OSC::get_sorted_stripables(std::bitset<32> types)
        return sorted;
 }
 
+int
+OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
+{
+       int ret = 1; /* unhandled */
+
+       if (!strncmp (path, "/cue/aux", 8)) {
+               // set our Aux bus
+               cue_set (argv[0]->i, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/connect", 12)) {
+               // switch to next Aux bus
+               cue_set (0, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/next_aux", 13)) {
+               // switch to next Aux bus
+               cue_next (msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/previous_aux", 17)) {
+               // switch to previous Aux bus
+               cue_previous (msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/send/fader/", 16) && strlen (path) > 16) {
+               int id = atoi (&path[16]);
+               cue_send_fader (id, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/send/enable/", 17) && strlen (path) > 17) {
+               int id = atoi (&path[17]);
+               cue_send_enable (id, argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/fader", 10)) {
+               cue_aux_fader (argv[0]->f, msg);
+               ret = 0;
+       }
+       else if (!strncmp (path, "/cue/mute", 9)) {
+               cue_aux_mute (argv[0]->f, msg);
+               ret = 0;
+       }
+
+       if ((ret && _debugmode == Unhandled)) {
+               debugmsg (_("Unhandled OSC cue message"), path, types, argv, argc);
+       } else if ((!ret && _debugmode == All)) {
+               debugmsg (_("OSC cue"), path, types, argv, argc);
+       }
+
+       return ret;
+}
+
+int
+OSC::cue_set (uint32_t aux, lo_message msg)
+{
+       return _cue_set (aux, get_address (msg));
+}
+
+int
+OSC::_cue_set (uint32_t aux, lo_address addr)
+{
+       OSCSurface *s = get_surface(addr);
+       s->bank_size = 0;
+       s->strip_types = 128;
+       s->feedback = 0;
+       s->gainmode = 1;
+       s->cue = true;
+       s->aux = aux;
+       s->strips = get_sorted_stripables(s->strip_types);
+
+       s->nstrips = s->strips.size();
+       // get rid of any old CueObsevers for this address
+       cueobserver_connections.drop_connections ();
+       CueObservers::iterator x;
+       for (x = cue_observers.begin(); x != cue_observers.end();) {
+
+               OSCCueObserver* co;
+
+               if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
+
+                       int res = strcmp(lo_address_get_url(co->address()), lo_address_get_url(addr));
+
+                       if (res == 0) {
+                               delete *x;
+                               x = cue_observers.erase (x);
+                       } else {
+                               ++x;
+                       }
+               } else {
+                       ++x;
+               }
+       }
+
+       // get a list of Auxes
+       for (uint32_t n = 0; n < s->nstrips; ++n) {
+               boost::shared_ptr<Stripable> stp = s->strips[n];
+               if (stp) {
+                       text_message (string_compose ("/cue/name/%1", n+1), stp->name(), addr);
+                       if (aux == n+1) {
+                               // aux must be at least one
+                               // need a signal if aux vanishes
+                               stp->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::_cue_set, this, aux, addr), this);
+
+                               // make a list of stripables with sends that go to this bus
+                               s->sends = cue_get_sorted_stripables(stp, aux, addr);
+                               // start cue observer
+                               OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr);
+                               cue_observers.push_back (co);
+                       }
+
+               }
+       }
+
+       return 0;
+}
+
+int
+OSC::cue_next (lo_message msg)
+{
+       OSCSurface *s = get_surface(get_address (msg));
+       if (s->aux < s->nstrips) {
+               cue_set (s->aux + 1, msg);
+       } else {
+               cue_set (s->nstrips, msg);
+       }
+       return 0;
+}
+
+int
+OSC::cue_previous (lo_message msg)
+{
+       OSCSurface *s = get_surface(get_address (msg));
+       if (s->aux > 1) {
+               cue_set (s->aux - 1, msg);
+       }
+       return 0;
+}
+
+boost::shared_ptr<Send>
+OSC::cue_get_send (uint32_t id, lo_address addr)
+{
+       OSCSurface *s = get_surface(addr);
+       if (id && s->aux > 0 && id <= s->sends.size()) {
+               boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s->sends[id - 1]);
+               boost::shared_ptr<Stripable> aux = get_strip (s->aux, addr);
+               if (r && aux) {
+                       return r->internal_send_for (boost::dynamic_pointer_cast<Route> (aux));
+               }
+       }
+       return boost::shared_ptr<Send>();
+
+}
+
+int
+OSC::cue_aux_fader (float position, lo_message msg)
+{
+       if (!session) return -1;
+
+       OSCSurface *sur = get_surface(get_address (msg));
+       if (sur->cue) {
+               if (sur->aux) {
+                       boost::shared_ptr<Stripable> s = get_strip (sur->aux, get_address (msg));
+
+                       if (s) {
+                               float abs;
+                               abs = slider_position_to_gain_with_max (position, 2.0);
+                               if (s->gain_control()) {
+                                       s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+                                       return 0;
+                               }
+                       }
+               }
+       }
+       return cue_float_message ("/cue/fader", 0, get_address (msg));
+}
+
+int
+OSC::cue_aux_mute (float state, lo_message msg)
+{
+       if (!session) return -1;
+
+       OSCSurface *sur = get_surface(get_address (msg));
+       if (sur->cue) {
+               if (sur->aux) {
+                       boost::shared_ptr<Stripable> s = get_strip (sur->aux, get_address (msg));
+
+                       if (s->mute_control()) {
+                               s->mute_control()->set_value (state ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                               return 0;
+                       }
+               }
+       }
+       return cue_float_message ("/cue/mute", 0, get_address (msg));
+}
+
+int
+OSC::cue_send_fader (uint32_t id, float val, lo_message msg)
+{
+       if (!session) {
+               return -1;
+       }
+       boost::shared_ptr<Send> s = cue_get_send (id, get_address (msg));
+       float abs;
+       if (s) {
+               if (s->gain_control()) {
+                       abs = slider_position_to_gain_with_max (val, 2.0);
+                       s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return cue_float_message (string_compose ("/cue/send/fader/%1", id), 0, get_address (msg));
+}
+
+int
+OSC::cue_send_enable (uint32_t id, float state, lo_message msg)
+{
+       if (!session)
+               return -1;
+       boost::shared_ptr<Send> s = cue_get_send (id, get_address (msg));
+       if (s) {
+               if (state) {
+                       s->activate ();
+               } else {
+                       s->deactivate ();
+               }
+               return 0;
+       }
+       return cue_float_message (string_compose ("/cue/send/enable/%1", id), 0, get_address (msg));
+}
+
+int
+OSC::cue_float_message (string path, float val, lo_address addr)
+{
+
+       lo_message reply;
+       reply = lo_message_new ();
+       lo_message_add_float (reply, (float) val);
+
+       lo_send_message (addr, path.c_str(), reply);
+       lo_message_free (reply);
+
+       return 0;
+}
+
+int
+OSC::text_message (string path, string val, lo_address addr)
+{
+
+       lo_message reply;
+       reply = lo_message_new ();
+       lo_message_add_string (reply, val.c_str());
+
+       lo_send_message (addr, path.c_str(), reply);
+       lo_message_free (reply);
+
+       return 0;
+}
+
+
+// we have to have a sorted list of stripables that have sends pointed at our aux
+// we can use the one in osc.cc to get an aux list
+OSC::Sorted
+OSC::cue_get_sorted_stripables(boost::shared_ptr<Stripable> aux, uint32_t id, lo_message msg)
+{
+       Sorted sorted;
+       cueobserver_connections.drop_connections ();
+       // fetch all stripables
+       StripableList stripables;
+
+       session->get_stripables (stripables);
+
+       // Look for stripables that have a send to aux
+       for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+
+               boost::shared_ptr<Stripable> s = *it;
+               // we only want routes
+               boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+               if (r) {
+                       r->processors_changed.connect  (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+                       boost::shared_ptr<Send> snd = r->internal_send_for (boost::dynamic_pointer_cast<Route> (aux));
+                       if (snd) { // test for send to aux
+                               sorted.push_back (s);
+                               s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::cue_set, this, id, msg), this);
+                       }
+               }
+
+
+       }
+       sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
+
+       return sorted;
+}
+