enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git] / libs / surfaces / osc / osc.cc
index f29d7aafe78e286b79c4d60830e10cc3c9151ee2..42828626e4cfbd51e7443206917b2f29224aa48b 100644 (file)
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 
 #include "pbd/gstdio_compat.h"
-#include <glibmm/miscutils.h>
+#include <glibmm.h>
 
 #include <pbd/convert.h>
 #include <pbd/pthread_utils.h>
 #include "ardour/route.h"
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
+#include "ardour/monitor_control.h"
 #include "ardour/dB.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/panner.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
+#include "ardour/presentation_info.h"
 #include "ardour/send.h"
+#include "ardour/phase_control.h"
+#include "ardour/solo_isolate_control.h"
+#include "ardour/solo_safe_control.h"
+#include "ardour/vca_manager.h"
 
+#include "osc_select_observer.h"
 #include "osc.h"
 #include "osc_controllable.h"
 #include "osc_route_observer.h"
-#include "i18n.h"
+#include "osc_global_observer.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -73,7 +81,7 @@ static void error_callback(int, const char *, const char *)
 
 OSC::OSC (Session& s, uint32_t port)
        : ControlProtocol (s, X_("Open Sound Control (OSC)"))
-       , AbstractUI<OSCUIRequest> ("osc")
+       , AbstractUI<OSCUIRequest> (name())
        , local_server (0)
        , remote_server (0)
        , _port(port)
@@ -81,12 +89,14 @@ OSC::OSC (Session& s, uint32_t port)
        , _shutdown (false)
        , _osc_server (0)
        , _osc_unix_server (0)
-       , _namespace_root ("/ardour")
        , _send_route_changes (true)
+       , _debugmode (Off)
+       , tick (true)
+       , bank_dirty (false)
+       , gui (0)
 {
        _instance = this;
 
-       session_loaded (s);
        session->Exported.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::session_exported, this, _1, _2), this);
 }
 
@@ -96,6 +106,17 @@ OSC::~OSC()
        _instance = 0;
 }
 
+void*
+OSC::request_factory (uint32_t num_requests)
+{
+       /* AbstractUI<T>::request_buffer_factory() is a template method only
+          instantiated in this source module. To provide something visible for
+          use in the interface/descriptor, we have this static method that is
+          template-free.
+       */
+       return request_buffer_factory (num_requests);
+}
+
 void
 OSC::do_request (OSCUIRequest* req)
 {
@@ -214,19 +235,40 @@ OSC::start ()
 
        register_callbacks();
 
+       session_loaded (*session);
+
        // lo_server_thread_add_method(_sthread, NULL, NULL, OSC::_dummy_handler, this);
 
        /* startup the event loop thread */
 
        BaseUI::run ();
 
+       // start timers for metering, timecode and heartbeat.
+       // timecode and metering run at 100
+       Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (100); // milliseconds
+       periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &OSC::periodic));
+       periodic_timeout->attach (main_loop()->get_context());
+
+       // catch changes to selection for GUI_select mode
+       StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
+
+       // catch track reordering
+       // receive routes added
+       session->RouteAdded.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::notify_routes_added, this, _1), this);
+       // receive VCAs added
+       session->vca_manager().VCAAdded.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::notify_vca_added, this, _1), this);
+       // order changed
+       PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+
+       _select = boost::shared_ptr<Stripable>();
+
        return 0;
 }
 
 void
 OSC::thread_init ()
 {
-       pthread_set_name (X_("OSC"));
+       pthread_set_name (event_loop_name().c_str());
 
        if (_osc_unix_server) {
                Glib::RefPtr<IOSource> src = IOSource::create (lo_server_get_socket_fd (_osc_unix_server), IO_IN|IO_HUP|IO_ERR);
@@ -237,15 +279,20 @@ OSC::thread_init ()
        }
 
        if (_osc_server) {
+#ifdef PLATFORM_WINDOWS
+               Glib::RefPtr<IOChannel> chan = Glib::IOChannel::create_from_win32_socket (lo_server_get_socket_fd (_osc_server));
+               Glib::RefPtr<IOSource> src  = IOSource::create (chan, IO_IN|IO_HUP|IO_ERR);
+#else
                Glib::RefPtr<IOSource> src  = IOSource::create (lo_server_get_socket_fd (_osc_server), IO_IN|IO_HUP|IO_ERR);
+#endif
                src->connect (sigc::bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_server));
                src->attach (_main_loop->get_context());
                remote_server = src->gobj();
                g_source_ref (remote_server);
        }
 
-       PBD::notify_gui_about_thread_creation (X_("gui"), pthread_self(), X_("OSC"), 2048);
-       SessionEvent::create_per_thread_pool (X_("OSC"), 128);
+       PBD::notify_event_loops_about_thread_creation (pthread_self(), event_loop_name(), 2048);
+       SessionEvent::create_per_thread_pool (event_loop_name(), 128);
 }
 
 int
@@ -285,6 +332,8 @@ OSC::stop ()
                ::g_unlink (_osc_url_file.c_str() );
        }
 
+       periodic_connection.disconnect ();
+       session_connections.drop_connections ();
        // Delete any active route observers
        for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
@@ -297,6 +346,26 @@ OSC::stop ()
                        ++x;
                }
        }
+// 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;
+               }
+       }
 
        return 0;
 }
@@ -318,75 +387,208 @@ OSC::register_callbacks()
 
                serv = srvs[i];
 
-               /* this is a special catchall handler */
-
-               lo_server_add_method (serv, 0, 0, _catchall, this);
 
 #define REGISTER_CALLBACK(serv,path,types, function) lo_server_add_method (serv, path, types, OSC::_ ## function, this)
 
-               REGISTER_CALLBACK (serv, "/routes/list", "", routes_list);
-               REGISTER_CALLBACK (serv, "/ardour/add_marker", "", add_marker);
-               REGISTER_CALLBACK (serv, "/ardour/access_action", "s", access_action);
-               REGISTER_CALLBACK (serv, "/ardour/loop_toggle", "", loop_toggle);
-               REGISTER_CALLBACK (serv, "/ardour/loop_location", "ii", loop_location);
-               REGISTER_CALLBACK (serv, "/ardour/goto_start", "", goto_start);
-               REGISTER_CALLBACK (serv, "/ardour/goto_end", "", goto_end);
-               REGISTER_CALLBACK (serv, "/ardour/rewind", "", rewind);
-               REGISTER_CALLBACK (serv, "/ardour/ffwd", "", ffwd);
-               REGISTER_CALLBACK (serv, "/ardour/transport_stop", "", transport_stop);
-               REGISTER_CALLBACK (serv, "/ardour/transport_play", "", transport_play);
-               REGISTER_CALLBACK (serv, "/ardour/transport_frame", "", transport_frame);
-               REGISTER_CALLBACK (serv, "/ardour/transport_speed", "", transport_speed);
-               REGISTER_CALLBACK (serv, "/ardour/record_enabled", "", record_enabled);
-               REGISTER_CALLBACK (serv, "/ardour/set_transport_speed", "f", set_transport_speed);
-               REGISTER_CALLBACK (serv, "/ardour/locate", "ii", locate);
-               REGISTER_CALLBACK (serv, "/ardour/save_state", "", save_state);
-               REGISTER_CALLBACK (serv, "/ardour/prev_marker", "", prev_marker);
-               REGISTER_CALLBACK (serv, "/ardour/next_marker", "", next_marker);
-               REGISTER_CALLBACK (serv, "/ardour/undo", "", undo);
-               REGISTER_CALLBACK (serv, "/ardour/redo", "", redo);
-               REGISTER_CALLBACK (serv, "/ardour/toggle_punch_in", "", toggle_punch_in);
-               REGISTER_CALLBACK (serv, "/ardour/toggle_punch_out", "", toggle_punch_out);
-               REGISTER_CALLBACK (serv, "/ardour/rec_enable_toggle", "", rec_enable_toggle);
-               REGISTER_CALLBACK (serv, "/ardour/toggle_all_rec_enables", "", toggle_all_rec_enables);
-               
-               /*
-                * NOTE:  these messages are provided for (arguably broken) apps
-                *   that MUST send float args ( TouchOSC and Lemur ).
-                * Normally these ardour transport messages don't require an argument,
-                * so we're providing redundant calls with vestigial "float" args. 
-               */
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_loop_toggle", "f", loop_toggle);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_add_marker", "f", add_marker);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_goto_start", "f", goto_start);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_goto_end", "f", goto_end);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_rewind", "f", rewind);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_ffwd", "f", ffwd);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_transport_stop", "f", transport_stop);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_transport_play", "f", transport_play);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_save_state", "f", save_state);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_prev_marker", "f", prev_marker);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_next_marker", "f", next_marker);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_undo", "f", undo);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_redo", "f", redo);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_toggle_punch_in", "f", toggle_punch_in);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_toggle_punch_out", "f", toggle_punch_out);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_rec_enable_toggle", "f", rec_enable_toggle);
-               REGISTER_CALLBACK (serv, "/ardour/unused_argument_toggle_all_rec_enables", "f", toggle_all_rec_enables);
-
-               REGISTER_CALLBACK (serv, "/ardour/routes/mute", "ii", route_mute);
-               REGISTER_CALLBACK (serv, "/ardour/routes/solo", "ii", route_solo);
-               REGISTER_CALLBACK (serv, "/ardour/routes/recenable", "ii", route_recenable);
-               REGISTER_CALLBACK (serv, "/ardour/routes/gainabs", "if", route_set_gain_abs);
-               REGISTER_CALLBACK (serv, "/ardour/routes/gaindB", "if", route_set_gain_dB);
-               REGISTER_CALLBACK (serv, "/ardour/routes/trimabs", "if", route_set_trim_abs);
-               REGISTER_CALLBACK (serv, "/ardour/routes/trimdB", "if", route_set_trim_dB);
-               REGISTER_CALLBACK (serv, "/ardour/routes/pan_stereo_position", "if", route_set_pan_stereo_position);
-               REGISTER_CALLBACK (serv, "/ardour/routes/pan_stereo_width", "if", route_set_pan_stereo_width);
-               REGISTER_CALLBACK (serv, "/ardour/routes/plugin/parameter", "iiif", route_plugin_parameter);
-               REGISTER_CALLBACK (serv, "/ardour/routes/plugin/parameter/print", "iii", route_plugin_parameter_print);
-               REGISTER_CALLBACK (serv, "/ardour/routes/send/gainabs", "iif", route_set_send_gain_abs);
-               REGISTER_CALLBACK (serv, "/ardour/routes/send/gaindB", "iif", route_set_send_gain_dB);
+               // Some controls have optional "f" for feedback or touchosc
+               // http://hexler.net/docs/touchosc-controls-reference
+
+               REGISTER_CALLBACK (serv, "/set_surface", "iiii", set_surface);
+               REGISTER_CALLBACK (serv, "/set_surface/feedback", "i", set_surface_feedback);
+               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, "/strip/list", "", routes_list);
+               REGISTER_CALLBACK (serv, "/add_marker", "", add_marker);
+               REGISTER_CALLBACK (serv, "/add_marker", "f", add_marker);
+               REGISTER_CALLBACK (serv, "/access_action", "s", access_action);
+               REGISTER_CALLBACK (serv, "/loop_toggle", "", loop_toggle);
+               REGISTER_CALLBACK (serv, "/loop_toggle", "f", loop_toggle);
+               REGISTER_CALLBACK (serv, "/loop_location", "ii", loop_location);
+               REGISTER_CALLBACK (serv, "/goto_start", "", goto_start);
+               REGISTER_CALLBACK (serv, "/goto_start", "f", goto_start);
+               REGISTER_CALLBACK (serv, "/goto_end", "", goto_end);
+               REGISTER_CALLBACK (serv, "/goto_end", "f", goto_end);
+               REGISTER_CALLBACK (serv, "/rewind", "", rewind);
+               REGISTER_CALLBACK (serv, "/rewind", "f", rewind);
+               REGISTER_CALLBACK (serv, "/ffwd", "", ffwd);
+               REGISTER_CALLBACK (serv, "/ffwd", "f", ffwd);
+               REGISTER_CALLBACK (serv, "/transport_stop", "", transport_stop);
+               REGISTER_CALLBACK (serv, "/transport_stop", "f", transport_stop);
+               REGISTER_CALLBACK (serv, "/transport_play", "", transport_play);
+               REGISTER_CALLBACK (serv, "/transport_play", "f", transport_play);
+               REGISTER_CALLBACK (serv, "/transport_frame", "", transport_frame);
+               REGISTER_CALLBACK (serv, "/transport_speed", "", transport_speed);
+               REGISTER_CALLBACK (serv, "/record_enabled", "", record_enabled);
+               REGISTER_CALLBACK (serv, "/set_transport_speed", "f", set_transport_speed);
+               // locate ii is position and bool roll
+               REGISTER_CALLBACK (serv, "/locate", "ii", locate);
+               REGISTER_CALLBACK (serv, "/save_state", "", save_state);
+               REGISTER_CALLBACK (serv, "/save_state", "f", save_state);
+               REGISTER_CALLBACK (serv, "/prev_marker", "", prev_marker);
+               REGISTER_CALLBACK (serv, "/prev_marker", "f", prev_marker);
+               REGISTER_CALLBACK (serv, "/next_marker", "", next_marker);
+               REGISTER_CALLBACK (serv, "/next_marker", "f", next_marker);
+               REGISTER_CALLBACK (serv, "/undo", "", undo);
+               REGISTER_CALLBACK (serv, "/undo", "f", undo);
+               REGISTER_CALLBACK (serv, "/redo", "", redo);
+               REGISTER_CALLBACK (serv, "/redo", "f", redo);
+               REGISTER_CALLBACK (serv, "/toggle_punch_in", "", toggle_punch_in);
+               REGISTER_CALLBACK (serv, "/toggle_punch_in", "f", toggle_punch_in);
+               REGISTER_CALLBACK (serv, "/toggle_punch_out", "", toggle_punch_out);
+               REGISTER_CALLBACK (serv, "/toggle_punch_out", "f", toggle_punch_out);
+               REGISTER_CALLBACK (serv, "/rec_enable_toggle", "", rec_enable_toggle);
+               REGISTER_CALLBACK (serv, "/rec_enable_toggle", "f", rec_enable_toggle);
+               REGISTER_CALLBACK (serv, "/toggle_all_rec_enables", "", toggle_all_rec_enables);
+               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);
+               REGISTER_CALLBACK (serv, "/jump_seconds", "f", jump_by_seconds);
+               REGISTER_CALLBACK (serv, "/mark_in", "", mark_in);
+               REGISTER_CALLBACK (serv, "/mark_in", "f", mark_in);
+               REGISTER_CALLBACK (serv, "/mark_out", "", mark_out);
+               REGISTER_CALLBACK (serv, "/mark_out", "f", mark_out);
+               REGISTER_CALLBACK (serv, "/toggle_click", "", toggle_click);
+               REGISTER_CALLBACK (serv, "/toggle_click", "f", toggle_click);
+               REGISTER_CALLBACK (serv, "/midi_panic", "", midi_panic);
+               REGISTER_CALLBACK (serv, "/midi_panic", "f", midi_panic);
+               REGISTER_CALLBACK (serv, "/toggle_roll", "", toggle_roll);
+               REGISTER_CALLBACK (serv, "/toggle_roll", "f", toggle_roll);
+               REGISTER_CALLBACK (serv, "/stop_forget", "", stop_forget);
+               REGISTER_CALLBACK (serv, "/stop_forget", "f", stop_forget);
+               REGISTER_CALLBACK (serv, "/set_punch_range", "", set_punch_range);
+               REGISTER_CALLBACK (serv, "/set_punch_range", "f", set_punch_range);
+               REGISTER_CALLBACK (serv, "/set_loop_range", "", set_loop_range);
+               REGISTER_CALLBACK (serv, "/set_loop_range", "f", set_loop_range);
+               REGISTER_CALLBACK (serv, "/set_session_range", "", set_session_range);
+               REGISTER_CALLBACK (serv, "/set_session_range", "f", set_session_range);
+               // /toggle_monitor_* not working (comented out)
+               REGISTER_CALLBACK (serv, "/toggle_monitor_mute", "", toggle_monitor_mute);
+               REGISTER_CALLBACK (serv, "/toggle_monitor_mute", "f", toggle_monitor_mute);
+               REGISTER_CALLBACK (serv, "/toggle_monitor_dim", "", toggle_monitor_dim);
+               REGISTER_CALLBACK (serv, "/toggle_monitor_dim", "f", toggle_monitor_dim);
+               REGISTER_CALLBACK (serv, "/toggle_monitor_mono", "", toggle_monitor_mono);
+               REGISTER_CALLBACK (serv, "/toggle_monitor_mono", "f", toggle_monitor_mono);
+               REGISTER_CALLBACK (serv, "/quick_snapshot_switch", "", quick_snapshot_switch);
+               REGISTER_CALLBACK (serv, "/quick_snapshot_switch", "f", quick_snapshot_switch);
+               REGISTER_CALLBACK (serv, "/quick_snapshot_stay", "", quick_snapshot_stay);
+               REGISTER_CALLBACK (serv, "/quick_snapshot_stay", "f", quick_snapshot_stay);
+               REGISTER_CALLBACK (serv, "/fit_1_track", "", fit_1_track);
+               REGISTER_CALLBACK (serv, "/fit_1_track", "f", fit_1_track);
+               REGISTER_CALLBACK (serv, "/fit_2_tracks", "", fit_2_tracks);
+               REGISTER_CALLBACK (serv, "/fit_2_tracks", "f", fit_2_tracks);
+               REGISTER_CALLBACK (serv, "/fit_4_tracks", "", fit_4_tracks);
+               REGISTER_CALLBACK (serv, "/fit_4_tracks", "f", fit_4_tracks);
+               REGISTER_CALLBACK (serv, "/fit_8_tracks", "", fit_8_tracks);
+               REGISTER_CALLBACK (serv, "/fit_8_tracks", "f", fit_8_tracks);
+               REGISTER_CALLBACK (serv, "/fit_16_tracks", "", fit_16_tracks);
+               REGISTER_CALLBACK (serv, "/fit_16_tracks", "f", fit_16_tracks);
+               REGISTER_CALLBACK (serv, "/fit_32_tracks", "", fit_32_tracks);
+               REGISTER_CALLBACK (serv, "/fit_32_tracks", "f", fit_32_tracks);
+               REGISTER_CALLBACK (serv, "/fit_all_tracks", "", fit_all_tracks);
+               REGISTER_CALLBACK (serv, "/fit_all_tracks", "f", fit_all_tracks);
+               REGISTER_CALLBACK (serv, "/zoom_100_ms", "", zoom_100_ms);
+               REGISTER_CALLBACK (serv, "/zoom_100_ms", "f", zoom_100_ms);
+               REGISTER_CALLBACK (serv, "/zoom_1_sec", "", zoom_1_sec);
+               REGISTER_CALLBACK (serv, "/zoom_1_sec", "f", zoom_1_sec);
+               REGISTER_CALLBACK (serv, "/zoom_10_sec", "", zoom_10_sec);
+               REGISTER_CALLBACK (serv, "/zoom_10_sec", "f", zoom_10_sec);
+               REGISTER_CALLBACK (serv, "/zoom_1_min", "", zoom_1_min);
+               REGISTER_CALLBACK (serv, "/zoom_1_min", "f", zoom_1_min);
+               REGISTER_CALLBACK (serv, "/zoom_5_min", "", zoom_5_min);
+               REGISTER_CALLBACK (serv, "/zoom_5_min", "f", zoom_5_min);
+               REGISTER_CALLBACK (serv, "/zoom_10_min", "", zoom_10_min);
+               REGISTER_CALLBACK (serv, "/zoom_10_min", "f", zoom_10_min);
+               REGISTER_CALLBACK (serv, "/zoom_to_session", "", zoom_to_session);
+               REGISTER_CALLBACK (serv, "/zoom_to_session", "f", zoom_to_session);
+               REGISTER_CALLBACK (serv, "/temporal_zoom_in", "f", temporal_zoom_in);
+               REGISTER_CALLBACK (serv, "/temporal_zoom_in", "", temporal_zoom_in);
+               REGISTER_CALLBACK (serv, "/temporal_zoom_out", "", temporal_zoom_out);
+               REGISTER_CALLBACK (serv, "/temporal_zoom_out", "f", temporal_zoom_out);
+               REGISTER_CALLBACK (serv, "/scroll_up_1_track", "f", scroll_up_1_track);
+               REGISTER_CALLBACK (serv, "/scroll_up_1_track", "", scroll_up_1_track);
+               REGISTER_CALLBACK (serv, "/scroll_dn_1_track", "f", scroll_dn_1_track);
+               REGISTER_CALLBACK (serv, "/scroll_dn_1_track", "", scroll_dn_1_track);
+               REGISTER_CALLBACK (serv, "/scroll_up_1_page", "f", scroll_up_1_page);
+               REGISTER_CALLBACK (serv, "/scroll_up_1_page", "", scroll_up_1_page);
+               REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "f", scroll_dn_1_page);
+               REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "", scroll_dn_1_page);
+               REGISTER_CALLBACK (serv, "/bank_up", "", bank_up);
+               REGISTER_CALLBACK (serv, "/bank_up", "f", bank_up);
+               REGISTER_CALLBACK (serv, "/bank_down", "", bank_down);
+               REGISTER_CALLBACK (serv, "/bank_down", "f", bank_down);
+
+               // 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/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);
+
+               // Controls for the Selected strip
+               REGISTER_CALLBACK (serv, "/select/recenable", "i", sel_recenable);
+               REGISTER_CALLBACK (serv, "/select/record_safe", "i", sel_recsafe);
+               REGISTER_CALLBACK (serv, "/select/mute", "i", sel_mute);
+               REGISTER_CALLBACK (serv, "/select/solo", "i", sel_solo);
+               REGISTER_CALLBACK (serv, "/select/solo_iso", "i", sel_solo_iso);
+               REGISTER_CALLBACK (serv, "/select/solo_safe", "i", sel_solo_safe);
+               REGISTER_CALLBACK (serv, "/select/monitor_input", "i", sel_monitor_input);
+               REGISTER_CALLBACK (serv, "/select/monitor_disk", "i", sel_monitor_disk);
+               REGISTER_CALLBACK (serv, "/select/polarity", "i", sel_phase);
+               REGISTER_CALLBACK (serv, "/select/gain", "f", sel_gain);
+               REGISTER_CALLBACK (serv, "/select/fader", "f", sel_fader);
+               REGISTER_CALLBACK (serv, "/select/trimdB", "f", sel_trim);
+               REGISTER_CALLBACK (serv, "/select/pan_stereo_position", "f", sel_pan_position);
+               REGISTER_CALLBACK (serv, "/select/pan_stereo_width", "f", sel_pan_width);
+               REGISTER_CALLBACK (serv, "/select/send_gain", "if", sel_sendgain);
+               REGISTER_CALLBACK (serv, "/select/send_fader", "if", sel_sendfader);
+               REGISTER_CALLBACK (serv, "/select/send_enable", "if", sel_sendenable);
+               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/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/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);
+               REGISTER_CALLBACK (serv, "/strip/solo", "ii", route_solo);
+               REGISTER_CALLBACK (serv, "/strip/solo_iso", "ii", route_solo_iso);
+               REGISTER_CALLBACK (serv, "/strip/solo_safe", "ii", route_solo_safe);
+               REGISTER_CALLBACK (serv, "/strip/recenable", "ii", route_recenable);
+               REGISTER_CALLBACK (serv, "/strip/record_safe", "ii", route_recsafe);
+               REGISTER_CALLBACK (serv, "/strip/monitor_input", "ii", route_monitor_input);
+               REGISTER_CALLBACK (serv, "/strip/monitor_disk", "ii", route_monitor_disk);
+               REGISTER_CALLBACK (serv, "/strip/expand", "ii", strip_expand);
+               REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_gui_select);
+               REGISTER_CALLBACK (serv, "/strip/polarity", "ii", strip_phase);
+               REGISTER_CALLBACK (serv, "/strip/gain", "if", route_set_gain_dB);
+               REGISTER_CALLBACK (serv, "/strip/fader", "if", route_set_gain_fader);
+               REGISTER_CALLBACK (serv, "/strip/trimdB", "if", route_set_trim_dB);
+               REGISTER_CALLBACK (serv, "/strip/pan_stereo_position", "if", route_set_pan_stereo_position);
+               REGISTER_CALLBACK (serv, "/strip/pan_stereo_width", "if", route_set_pan_stereo_width);
+               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/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);
 
                /* still not-really-standardized query interface */
                //REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
@@ -398,6 +600,10 @@ OSC::register_callbacks()
                //lo_server_add_method(serv, "/register_auto_update", "siss", OSC::global_register_auto_update_handler, this);
                //lo_server_add_method(serv, "/unregister_auto_update", "sss", OSC::_global_unregister_auto_update_handler, this);
 
+               /* this is a special catchall handler,
+                * register at the end so this is only called if no
+                * other handler matches (used for debug) */
+               lo_server_add_method (serv, 0, 0, _catchall, this);
        }
 }
 
@@ -446,8 +652,11 @@ OSC::get_unix_server_url()
 }
 
 void
-OSC::listen_to_route (boost::shared_ptr<Route> route, lo_address addr)
+OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
 {
+       if (!strip) {
+               return;
+       }
        /* avoid duplicate listens */
 
        for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); ++x) {
@@ -456,24 +665,34 @@ OSC::listen_to_route (boost::shared_ptr<Route> route, lo_address addr)
 
                if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
 
-                       int res = strcmp(lo_address_get_hostname(ro->address()), lo_address_get_hostname(addr));
+                       int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
 
-                       if (ro->route() == route && res == 0) {
+                       if (ro->strip() == strip && res == 0) {
                                return;
                        }
                }
        }
 
-       OSCRouteObserver* o = new OSCRouteObserver (route, addr);
+       OSCSurface *s = get_surface(addr);
+       uint32_t ssid = get_sid (strip, addr);
+       OSCRouteObserver* o = new OSCRouteObserver (strip, addr, ssid, s->gainmode, s->feedback);
        route_observers.push_back (o);
 
-       route->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::drop_route, this, boost::weak_ptr<Route> (route)), this);
+       strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::route_lost, this, boost::weak_ptr<Stripable> (strip)), this);
 }
 
 void
-OSC::drop_route (boost::weak_ptr<Route> wr)
+OSC::route_lost (boost::weak_ptr<Stripable> wr)
 {
-       boost::shared_ptr<Route> r = wr.lock ();
+       tick = false;
+       drop_route (wr);
+       bank_dirty = true;
+}
+
+void
+OSC::drop_route (boost::weak_ptr<Stripable> wr)
+{
+       boost::shared_ptr<Stripable> r = wr.lock ();
 
        if (!r) {
                return;
@@ -485,7 +704,7 @@ OSC::drop_route (boost::weak_ptr<Route> wr)
 
                if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
 
-                       if (rc->route() == r) {
+                       if (rc->strip() == r) {
                                delete *x;
                                x = route_observers.erase (x);
                        } else {
@@ -498,7 +717,7 @@ OSC::drop_route (boost::weak_ptr<Route> wr)
 }
 
 void
-OSC::end_listen (boost::shared_ptr<Route> r, lo_address addr)
+OSC::end_listen (boost::shared_ptr<Stripable> r, lo_address addr)
 {
        RouteObservers::iterator x;
 
@@ -509,9 +728,9 @@ OSC::end_listen (boost::shared_ptr<Route> r, lo_address addr)
 
                if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
 
-                       int res = strcmp(lo_address_get_hostname(ro->address()), lo_address_get_hostname(addr));
+                       int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
 
-                       if (ro->route() == r && res == 0) {
+                       if (ro->strip() == r && res == 0) {
                                delete *x;
                                x = route_observers.erase (x);
                        }
@@ -556,13 +775,13 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m
                lo_message_add_string (reply, "bad syntax");
        } else {
                id = argv[0]->i;
-               r = session->route_by_remote_id (id);
+               r = session->get_remote_nth_route (id);
 
                if (!r) {
                        lo_message_add_string (reply, "not found");
                } else {
 
-                       if (strcmp (path, "/routes/state") == 0) {
+                       if (strcmp (path, "/strip/state") == 0) {
 
                                if (boost::dynamic_pointer_cast<AudioTrack>(r)) {
                                        lo_message_add_string (reply, "AT");
@@ -578,11 +797,11 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m
                                lo_message_add_int32 (reply, r->muted());
                                lo_message_add_int32 (reply, r->soloed());
 
-                       } else if (strcmp (path, "/routes/mute") == 0) {
+                       } else if (strcmp (path, "/strip/mute") == 0) {
 
                                lo_message_add_int32 (reply, (float) r->muted());
 
-                       } else if (strcmp (path, "/routes/solo") == 0) {
+                       } else if (strcmp (path, "/strip/solo") == 0) {
 
                                lo_message_add_int32 (reply, r->soloed());
                        }
@@ -600,7 +819,7 @@ OSC::_catchall (const char *path, const char *types, lo_arg **argv, int argc, vo
 }
 
 int
-OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc, lo_message msg)
+OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
 {
        size_t len;
        int ret = 1; /* unhandled */
@@ -616,7 +835,7 @@ OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc,
                current_value_query (path, len, argv, argc, msg);
                ret = 0;
 
-       } else if (strcmp (path, "/routes/listen") == 0) {
+       } else if (strcmp (path, "/strip/listen") == 0) {
 
                cerr << "set up listener\n";
 
@@ -627,7 +846,7 @@ OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc,
                } else {
                        for (int n = 0; n < argc; ++n) {
 
-                               boost::shared_ptr<Route> r = session->route_by_remote_id (argv[n]->i);
+                               boost::shared_ptr<Route> r = session->get_remote_nth_route (argv[n]->i);
 
                                if (!r) {
                                        lo_message_add_string (reply, "not found");
@@ -646,11 +865,11 @@ OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc,
 
                ret = 0;
 
-       } else if (strcmp (path, "/routes/ignore") == 0) {
+       } else if (strcmp (path, "/strip/ignore") == 0) {
 
                for (int n = 0; n < argc; ++n) {
 
-                       boost::shared_ptr<Route> r = session->route_by_remote_id (argv[n]->i);
+                       boost::shared_ptr<Route> r = session->get_remote_nth_route (argv[n]->i);
 
                        if (r) {
                                end_listen (r, lo_message_get_source (msg));
@@ -658,11 +877,161 @@ OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc,
                }
 
                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, "/select/eq_gain/", 16) && strlen (path) > 16) {
+                       int ssid = atoi (&path[16]);
+                       route_solo (ssid, argv[0]->f == 1.0, msg);
+                       ret = 0;
+               }
+               else if (!strncmp (path, "/select/eq_freq/", 16) && strlen (path) > 16) {
+                       int ssid = atoi (&path[16]);
+                       route_solo (ssid, argv[0]->f == 1.0, msg);
+                       ret = 0;
+               }
+               else if (!strncmp (path, "/select/eq_q/", 13) && strlen (path) > 13) {
+                       int ssid = atoi (&path[13]);
+                       route_solo (ssid, argv[0]->f == 1.0, msg);
+                       ret = 0;
+               }
+               else if (!strncmp (path, "/select/eq_shape/", 17) && strlen (path) > 17) {
+                       int ssid = atoi (&path[17]);
+                       route_solo (ssid, argv[0]->f == 1.0, msg);
+                       ret = 0;
+               }
+       }
+
+       if ((ret && _debugmode == Unhandled)) {
+               debugmsg (_("Unhandled OSC message"), path, types, argv, argc);
        }
 
        return ret;
 }
 
+void
+OSC::debugmsg (const char *prefix, const char *path, const char* types, lo_arg **argv, int argc)
+{
+       std::stringstream ss;
+       for (int i = 0; i < argc; ++i) {
+               lo_type type = (lo_type)types[i];
+                       ss << " ";
+               switch (type) {
+                       case LO_INT32:
+                               ss << "i:" << argv[i]->i;
+                               break;
+                       case LO_FLOAT:
+                               ss << "f:" << argv[i]->f;
+                               break;
+                       case LO_DOUBLE:
+                               ss << "d:" << argv[i]->d;
+                               break;
+                       case LO_STRING:
+                               ss << "s:" << &argv[i]->s;
+                               break;
+                       case LO_INT64:
+                               ss << "h:" << argv[i]->h;
+                               break;
+                       case LO_CHAR:
+                               ss << "c:" << argv[i]->s;
+                               break;
+                       case LO_TIMETAG:
+                               ss << "<Timetag>";
+                               break;
+                       case LO_BLOB:
+                               ss << "<BLOB>";
+                               break;
+                       case LO_TRUE:
+                               ss << "#T";
+                               break;
+                       case LO_FALSE:
+                               ss << "#F";
+                               break;
+                       case LO_NIL:
+                               ss << "NIL";
+                               break;
+                       case LO_INFINITUM:
+                               ss << "#inf";
+                               break;
+                       case LO_MIDI:
+                               ss << "<MIDI>";
+                               break;
+                       case LO_SYMBOL:
+                               ss << "<SYMBOL>";
+                               break;
+                       default:
+                               ss << "< ?? >";
+                               break;
+               }
+       }
+       PBD::info << prefix << ": " << path << ss.str() << endmsg;
+}
+
 void
 OSC::update_clock ()
 {
@@ -673,8 +1042,8 @@ OSC::update_clock ()
 void
 OSC::session_loaded (Session& s)
 {
-       lo_address listener = lo_address_new (NULL, "7770");
-       lo_send (listener, "/session/loaded", "ss", s.path().c_str(), s.name().c_str());
+//     lo_address listener = lo_address_new (NULL, "7770");
+//     lo_send (listener, "/session/loaded", "ss", s.path().c_str(), s.name().c_str());
 }
 
 void
@@ -682,6 +1051,7 @@ OSC::session_exported (std::string path, std::string name)
 {
        lo_address listener = lo_address_new (NULL, "7770");
        lo_send (listener, "/session/exported", "ss", path.c_str(), name.c_str());
+       lo_address_free (listener);
 }
 
 // end "Application Hook" Handlers //
@@ -756,7 +1126,7 @@ OSC::routes_list (lo_message msg)
        }
        for (int n = 0; n < (int) session->nroutes(); ++n) {
 
-               boost::shared_ptr<Route> r = session->route_by_remote_id (n);
+               boost::shared_ptr<Route> r = session->get_remote_nth_route (n);
 
                if (r) {
 
@@ -775,13 +1145,16 @@ OSC::routes_list (lo_message msg)
                        lo_message_add_int32 (reply, r->n_outputs().n_audio());
                        lo_message_add_int32 (reply, r->muted());
                        lo_message_add_int32 (reply, r->soloed());
-                       lo_message_add_int32 (reply, r->remote_control_id());
+                       /* 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)));
 
                        if (boost::dynamic_pointer_cast<AudioTrack>(r)
                                        || boost::dynamic_pointer_cast<MidiTrack>(r)) {
 
                                boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(r);
-                               lo_message_add_int32 (reply, t->record_enabled());
+                               lo_message_add_int32 (reply, (int32_t) t->rec_enable_control()->get_value());
                        }
 
                        //Automatically listen to routes listed
@@ -804,6 +1177,358 @@ OSC::routes_list (lo_message msg)
        lo_message_free (reply);
 }
 
+int
+OSC::cancel_all_solos ()
+{
+       session->clear_all_solo_state (session->get_routes());
+       return 0;
+}
+
+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));
+       s->bank_size = b_size;
+       s->strip_types = strips;
+       s->feedback = fb;
+       s->gainmode = gm;
+       // set bank and strip feedback
+       set_bank(s->bank, msg);
+
+       global_feedback (s->feedback, lo_message_get_source (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));
+       s->bank_size = bs;
+
+       // set bank and strip feedback
+       set_bank(s->bank, msg);
+       return 0;
+}
+
+int
+OSC::set_surface_strip_types (uint32_t st, lo_message msg)
+{
+       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       s->strip_types = st;
+
+       // set bank and strip feedback
+       set_bank(s->bank, msg);
+       return 0;
+}
+
+
+int
+OSC::set_surface_feedback (uint32_t fb, lo_message msg)
+{
+       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       s->feedback = fb;
+
+       // set bank and strip feedback
+       set_bank(s->bank, msg);
+
+       // Set global/master feedback
+       global_feedback (s->feedback, lo_message_get_source (msg), s->gainmode);
+       return 0;
+}
+
+
+int
+OSC::set_surface_gainmode (uint32_t gm, lo_message msg)
+{
+       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       s->gainmode = gm;
+
+       // set bank and strip feedback
+       set_bank(s->bank, msg);
+
+       // Set global/master feedback
+       global_feedback (s->feedback, lo_message_get_source (msg), s->gainmode);
+       return 0;
+}
+
+OSC::OSCSurface *
+OSC::get_surface (lo_address addr)
+{
+       string r_url;
+       char * rurl;
+       rurl = lo_address_get_url (addr);
+       r_url = rurl;
+       free (rurl);
+       for (uint32_t it = 0; it < _surface.size(); ++it) {
+               //find setup for this server
+               if (!_surface[it].remote_url.find(r_url)){
+                       return &_surface[it];
+               }
+       }
+       // if we do this when OSC is started we get the wrong stripable
+       // we don't need this until we actually have a surface to deal with
+       if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
+               gui_selection_changed();
+       }
+
+       // No surface create one with default values
+       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.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);
+
+       return &_surface[_surface.size() - 1];
+}
+
+// setup global feedback for a surface
+void
+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(addr));
+
+                       if (res == 0) {
+                               delete *x;
+                               x = global_observers.erase (x);
+                       } else {
+                               ++x;
+                       }
+               } else {
+                       ++x;
+               }
+       }
+       if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
+               // create a new Global Observer for this surface
+               OSCGlobalObserver* o = new OSCGlobalObserver (*session, addr, gainmode, /*s->*/feedback);
+               global_observers.push_back (o);
+       }
+}
+
+void
+OSC::notify_routes_added (ARDOUR::RouteList &)
+{
+       // not sure if we need this
+       //recalcbanks();
+}
+
+void
+OSC::notify_vca_added (ARDOUR::VCAList &)
+{
+       // not sure if we need this
+       //recalcbanks();
+}
+
+void
+OSC::recalcbanks ()
+{
+       tick = false;
+       bank_dirty = true;
+}
+
+void
+OSC::_recalcbanks ()
+{
+       if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
+               _select = ControlProtocol::first_selected_stripable();
+       }
+
+       // do a set_bank for each surface we know about.
+       for (uint32_t it = 0; it < _surface.size(); ++it) {
+               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);
+       }
+}
+
+/*
+ * This gets called not only when bank changes but also:
+ *  - bank size change
+ *  - feedback change
+ *  - strip types changes
+ *  - fadermode changes
+ *  - stripable creation/deletion/flag
+ *  - to refresh what is "displayed"
+ * Basically any time the bank needs to be rebuilt
+ */
+int
+OSC::set_bank (uint32_t bank_start, lo_message msg)
+{
+       return _set_bank (bank_start, lo_message_get_source (msg));
+}
+
+// set bank is callable with either message or address
+int
+OSC::_set_bank (uint32_t bank_start, lo_address addr)
+{
+       if (!session) {
+               return -1;
+       }
+       // no nstripables yet
+       if (!session->nroutes()) {
+               return -1;
+       }
+
+       OSCSurface *s = get_surface (addr);
+
+       // revert any expand to select
+        s->expand = 0;
+        s->expand_enable = false;
+       _strip_select (ControlProtocol::first_selected_stripable(), addr);
+
+       // undo all listeners for this url
+       StripableList stripables;
+       session->get_stripables (stripables);
+       for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+
+               boost::shared_ptr<Stripable> stp = *it;
+               if (stp) {
+                       end_listen (stp, addr);
+               }
+       }
+
+       s->strips = get_sorted_stripables(s->strip_types);
+       s->nstrips = s->strips.size();
+
+       uint32_t b_size;
+       if (!s->bank_size) {
+               // no banking - bank includes all stripables
+               b_size = s->nstrips;
+       } else {
+               b_size = s->bank_size;
+       }
+
+       // Do limits checking
+       if (bank_start < 1) bank_start = 1;
+       if (b_size >= s->nstrips)  {
+               bank_start = 1;
+       } else if (bank_start > ((s->nstrips - b_size) + 1)) {
+               // top bank is always filled if there are enough strips for at least one bank
+               bank_start = (uint32_t)((s->nstrips - b_size) + 1);
+       }
+       //save bank in case we have had to change it
+       s->bank = bank_start;
+
+       if (s->feedback[0] || s->feedback[1]) {
+
+               for (uint32_t n = bank_start; n < (min ((b_size + bank_start), s->nstrips + 1)); ++n) {
+                       if (n <= s->strips.size()) {
+                               boost::shared_ptr<Stripable> stp = s->strips[n - 1];
+
+                               if (stp) {
+                                       listen_to_route(stp, addr);
+                               }
+                       }
+               }
+       }
+       // light bankup or bankdown buttons if it is possible to bank in that direction
+       if (s->feedback[4]) {
+               // these two messages could be bundled
+               lo_message reply;
+               reply = lo_message_new ();
+               if ((s->bank > (s->nstrips - s->bank_size)) || (s->nstrips < s->bank_size)) {
+                       lo_message_add_int32 (reply, 0);
+               } else {
+                       lo_message_add_int32 (reply, 1);
+               }
+               lo_send_message (addr, "/bank_up", reply);
+               lo_message_free (reply);
+               reply = lo_message_new ();
+               if (s->bank > 1) {
+                       lo_message_add_int32 (reply, 1);
+               } else {
+                       lo_message_add_int32 (reply, 0);
+               }
+               lo_send_message (addr, "/bank_down", reply);
+               lo_message_free (reply);
+       }
+       bank_dirty = false;
+       tick = true;
+       return 0;
+}
+
+int
+OSC::bank_up (lo_message msg)
+{
+       if (!session) {
+               return -1;
+       }
+       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       set_bank (s->bank + s->bank_size, msg);
+       return 0;
+}
+
+int
+OSC::bank_down (lo_message msg)
+{
+       if (!session) {
+               return -1;
+       }
+       OSCSurface *s = get_surface(lo_message_get_source (msg));
+       if (s->bank < s->bank_size) {
+               set_bank (1, msg);
+       } else {
+               set_bank (s->bank - s->bank_size, msg);
+       }
+       return 0;
+}
+
+uint32_t
+OSC::get_sid (boost::shared_ptr<ARDOUR::Stripable> strip, lo_address addr)
+{
+       if (!strip) {
+               return 0;
+       }
+
+       OSCSurface *s = get_surface(addr);
+
+       uint32_t b_size;
+       if (!s->bank_size) {
+               // no banking
+               b_size = s->nstrips;
+       } else {
+               b_size = s->bank_size;
+       }
+
+       for (uint32_t n = s->bank; n < (min ((b_size + s->bank), s->nstrips + 1)); ++n) {
+               if (n <= s->strips.size()) {
+                       if (strip == s->strips[n-1]) {
+                               return n - s->bank + 1;
+                       }
+               }
+       }
+       // failsafe... should never get here.
+       return 0;
+}
+
+boost::shared_ptr<ARDOUR::Stripable>
+OSC::get_strip (uint32_t ssid, lo_address addr)
+{
+       OSCSurface *s = get_surface(addr);
+       if (ssid && ((ssid + s->bank - 2) < s->nstrips)) {
+               return s->strips[ssid + s->bank - 2];
+       }
+       // guess it is out of range
+       return boost::shared_ptr<ARDOUR::Stripable>();
+}
+
 void
 OSC::transport_frame (lo_message msg)
 {
@@ -815,7 +1540,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), "/ardour/transport_frame", reply);
+       lo_send_message (lo_message_get_source (msg), "/transport_frame", reply);
 
        lo_message_free (reply);
 }
@@ -831,7 +1556,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), "/ardour/transport_speed", reply);
+       lo_send_message (lo_message_get_source (msg), "/transport_speed", reply);
 
        lo_message_free (reply);
 }
@@ -847,222 +1572,991 @@ 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), "/ardour/record_enabled", reply);
+       lo_send_message (lo_message_get_source (msg), "/record_enabled", reply);
 
        lo_message_free (reply);
 }
 
+// master and monitor calls
+int
+OSC::master_set_gain (float dB)
+{
+       if (!session) return -1;
+       boost::shared_ptr<Stripable> s = session->master_out();
+       if (s) {
+               if (dB < -192) {
+                       s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup);
+               } else {
+                       s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup);
+               }
+       }
+       return 0;
+}
 
 int
-OSC::route_mute (int rid, int yn)
+OSC::master_set_fader (uint32_t 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);
+               }
+       }
+       return 0;
+}
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+int
+OSC::master_set_trim (float dB)
+{
+       if (!session) return -1;
+       boost::shared_ptr<Stripable> s = session->master_out();
 
-       if (r) {
-               r->set_mute (yn, this);
+       if (s) {
+               s->trim_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup);
        }
 
        return 0;
 }
 
 int
-OSC::route_solo (int rid, int yn)
+OSC::master_set_pan_stereo_position (float position, lo_message msg)
 {
        if (!session) return -1;
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       float endposition = .5;
+       boost::shared_ptr<Stripable> s = session->master_out();
+
+       if (s) {
+               if (s->pan_azimuth_control()) {
+                       s->pan_azimuth_control()->set_value (position, PBD::Controllable::NoGroup);
+                       endposition = s->pan_azimuth_control()->get_value ();
+               }
+       }
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+
+       if (sur->feedback[4]) {
+               lo_message reply = lo_message_new ();
+               lo_message_add_float (reply, endposition);
 
-       if (r) {
-               boost::shared_ptr<RouteList> rl (new RouteList);
-               rl->push_back (r);
-               session->set_solo (rl, yn);
+               lo_send_message (lo_message_get_source (msg), "/master/pan_stereo_position", reply);
+               lo_message_free (reply);
        }
 
        return 0;
 }
 
 int
-OSC::route_recenable (int rid, int yn)
+OSC::master_set_mute (uint32_t state)
 {
        if (!session) return -1;
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Stripable> s = session->master_out();
 
-       if (r) {
-               r->set_record_enabled (yn, this);
+       if (s) {
+               s->mute_control()->set_value (state, PBD::Controllable::NoGroup);
        }
 
        return 0;
 }
 
 int
-OSC::route_set_gain_abs (int rid, float level)
+OSC::monitor_set_gain (float dB)
 {
        if (!session) return -1;
+       boost::shared_ptr<Stripable> s = session->monitor_out();
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
-
-       if (r) {
-               r->set_gain (level, this);
+       if (s) {
+               if (dB < -192) {
+                       s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup);
+               } else {
+                       s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup);
+               }
        }
-
        return 0;
 }
 
 int
-OSC::route_set_gain_dB (int rid, float dB)
+OSC::monitor_set_fader (uint32_t position)
 {
-       return route_set_gain_abs (rid, dB_to_coefficient (dB));
+       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);
+               }
+       }
+       return 0;
 }
 
-
+// strip calls
 int
-OSC::route_set_trim_abs (int rid, float level)
+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<Route> r = session->route_by_remote_id (rid);
-
-       if (r) {
-               r->set_trim (level, this);
+       if (s) {
+               if (s->mute_control()) {
+                       s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
        }
 
-       return 0;
+       return route_send_fail ("mute", ssid, 0, lo_message_get_source (msg));
 }
 
 int
-OSC::route_set_trim_dB (int rid, float dB)
+OSC::sel_mute (uint32_t yn, lo_message msg)
 {
-       return route_set_trim_abs(rid, dB_to_coefficient (dB));
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->mute_control()) {
+                       s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("mute", 0, lo_message_get_source (msg));
 }
 
-
 int
-OSC::route_set_pan_stereo_position (int rid, float pos)
+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<Route> r = session->route_by_remote_id (rid);
-
-       if (r) {
-               boost::shared_ptr<Panner> panner = r->panner();
-               if (panner) {
-                       panner->set_position (pos);
+       if (s) {
+               if (s->solo_control()) {
+                       s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
                }
        }
 
-       return 0;
-
+       return route_send_fail ("solo", ssid, 0, lo_message_get_source (msg));
 }
 
 int
-OSC::route_set_pan_stereo_width (int rid, float pos)
+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<Route> r = session->route_by_remote_id (rid);
+       if (s) {
+               if (s->solo_isolate_control()) {
+                       s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+
+       return route_send_fail ("solo_iso", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::route_solo_safe (int ssid, int yn, lo_message msg)
+{
+       if (!session) return -1;
+       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+
+       if (s) {
+               if (s->solo_safe_control()) {
+                       s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+
+       return route_send_fail ("solo_safe", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_solo (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       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", 0, lo_message_get_source (msg));
+}
 
-       if (r) {
-               boost::shared_ptr<Panner> panner = r->panner();
-               if (panner) {
-                       panner->set_width (pos);
+int
+OSC::sel_solo_iso (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->solo_isolate_control()) {
+                       s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
                }
        }
+       return sel_fail ("solo_iso", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_solo_safe (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->solo_safe_control()) {
+                       s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("solo_safe", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_recenable (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->rec_enable_control()) {
+                       s->rec_enable_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("recenable", 0, lo_message_get_source (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));
+
+       if (s) {
+               if (s->rec_enable_control()) {
+                       s->rec_enable_control()->set_value (yn, PBD::Controllable::UseGroup);
+                       if (s->rec_enable_control()->get_value()) {
+                               return 0;
+                       }
+               }
+       }
+       return route_send_fail ("recenable", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_recsafe (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->rec_safe_control()) {
+                       s->rec_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("record_safe", 0, lo_message_get_source (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));
+       if (s) {
+               if (s->rec_safe_control()) {
+                       s->rec_safe_control()->set_value (yn, PBD::Controllable::UseGroup);
+                       if (s->rec_safe_control()->get_value()) {
+                               return 0;
+                       }
+               }
+       }
+       return route_send_fail ("record_safe", ssid, 0,lo_message_get_source (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));
+
+       if (s) {
+               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+               if (track) {
+                       if (track->monitoring_control()) {
+                               track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                               return 0;
+                       }
+               }
+       }
+
+       return route_send_fail ("monitor_input", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_monitor_input (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+               if (track) {
+                       if (track->monitoring_control()) {
+                               track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                               return 0;
+                       }
+               }
+       }
+       return sel_fail ("monitor_input", 0, lo_message_get_source (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));
+
+       if (s) {
+               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+               if (track) {
+                       if (track->monitoring_control()) {
+                               track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+                               return 0;
+                       }
+               }
+       }
+
+       return route_send_fail ("monitor_disk", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_monitor_disk (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+               if (track) {
+                       if (track->monitoring_control()) {
+                               track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+                               return 0;
+                       }
+               }
+       }
+       return sel_fail ("monitor_disk", 0, lo_message_get_source (msg));
+}
+
+
+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));
+
+       if (s) {
+               if (s->phase_control()) {
+                       s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+
+       return route_send_fail ("polarity", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_phase (uint32_t yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->phase_control()) {
+                       s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("polarity", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::strip_expand (int ssid, int yn, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (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));
+       } else {
+               s = ControlProtocol::first_selected_stripable();
+       }
+
+       return _strip_select (s, lo_message_get_source (msg));
+}
+
+int
+OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
+{
+       if (!session) {
+               return -1;
+       }
+       OSCSurface *sur = get_surface(addr);
+       if (sur->sel_obs) {
+               delete sur->sel_obs;
+               sur->sel_obs = 0;
+       }
+       if (s) {
+               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) {
+                       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 {
+               route_send_fail ("select", sur->expand, 0 , addr);
+       }
+       //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.
+               b_s = sur->nstrips;
+       }
+       for (int i = 1;  i <= b_s; i++) {
+               string path = "expand";
+
+               if ((i == (int) sur->expand) && sur->expand_enable) {
+                       lo_message reply = lo_message_new ();
+                       if (sur->feedback[2]) {
+                               ostringstream os;
+                               os << "/strip/" << path << "/" << i;
+                               path = os.str();
+                       } else {
+                               ostringstream os;
+                               os << "/strip/" << path;
+                               path = os.str();
+                               lo_message_add_int32 (reply, i);
+                       }
+                       lo_message_add_float (reply, (float) 1);
+
+                       lo_send_message (addr, path.c_str(), reply);
+                       lo_message_free (reply);
+                       reply = lo_message_new ();
+                       lo_message_add_float (reply, 1.0);
+                       lo_send_message (addr, "/select/expand", reply);
+                       lo_message_free (reply);
+
+               } else {
+                       lo_message reply = lo_message_new ();
+                       lo_message_add_int32 (reply, i);
+                       lo_message_add_float (reply, 0.0);
+                       lo_send_message (addr, "/strip/expand", reply);
+                       lo_message_free (reply);
+               }
+       }
+       if (!sur->expand_enable) {
+               lo_message reply = lo_message_new ();
+               lo_message_add_float (reply, 0.0);
+               lo_send_message (addr, "/select/expand", reply);
+               lo_message_free (reply);
+       }
 
        return 0;
+}
+
+int
+OSC::strip_gui_select (int ssid, int yn, lo_message msg)
+{
+       //ignore button release
+       if (!yn) return 0;
+
+       if (!session) {
+               route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
+               return -1;
+       }
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       sur->expand_enable = false;
+       boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+       if (s) {
+               SetStripableSelection (s);
+       } else {
+               route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
+       }
+
+       return 0;
+}
+
+int
+OSC::sel_expand (uint32_t state, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (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));
+       } else {
+               s = ControlProtocol::first_selected_stripable();
+       }
+
+       return _strip_select (s, lo_message_get_source (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));
+
+       if (s) {
+               if (s->gain_control()) {
+                       s->gain_control()->set_value (level, PBD::Controllable::NoGroup);
+               } else {
+                       return 1;
+               }
+       } else {
+               return 1;
+       }
+
+       return 0;
+}
+
+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));
+               return -1;
+       }
+       int ret;
+       if (dB < -192) {
+               ret = route_set_gain_abs (ssid, 0.0, msg);
+       } else {
+               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 0;
+}
+
+int
+OSC::sel_gain (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               float abs;
+               if (val < -192) {
+                       abs = 0;
+               } else {
+                       abs = dB_to_coefficient (val);
+               }
+               if (s->gain_control()) {
+                       s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("gain", -193, lo_message_get_source (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));
+               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);
+       }
+       if (ret != 0) {
+               return route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
+       }
+       return 0;
+}
+
+int
+OSC::sel_fader (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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);
+               }
+               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));
+}
+
+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));
+
+       if (s) {
+               if (s->trim_control()) {
+                       s->trim_control()->set_value (level, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+
+       }
+
+       return -1;
+}
+
+int
+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 0;
+}
+
+int
+OSC::sel_trim (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->trim_control()) {
+                       s->trim_control()->set_value (dB_to_coefficient (val), PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("trimdB", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_pan_position (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if(s->pan_azimuth_control()) {
+                       s->pan_azimuth_control()->set_value (val, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+       return sel_fail ("pan_stereo_position", 0.5, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_pan_width (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->pan_width_control()) {
+                       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));
+}
+
+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));
+
+       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));
+               }
+       }
+
+       return route_send_fail ("pan_stereo_position", ssid, 0.5, lo_message_get_source (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));
+
+       if (s) {
+               if (s->pan_width_control()) {
+                       s->pan_width_control()->set_value (pos, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+       }
+
+       return route_send_fail ("pan_stereo_width", ssid, 1, lo_message_get_source (msg));
+}
+
+int
+OSC::route_set_send_gain_abs (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));
+
+       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;
+       }
+
+       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);
+}
+
+int
+OSC::route_set_send_fader (int ssid, int sid, float pos, 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);
+       }
+}
+
+int
+OSC::sel_sendgain (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       float abs;
+       if (s) {
+               if (val < -192) {
+                       abs = 0;
+               } else {
+                       abs = dB_to_coefficient (val);
+               }
+               if (id > 0) {
+                       --id;
+               }
 
+               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 + 1, -193, lo_message_get_source (msg));
 }
 
 int
-OSC::route_set_send_gain_abs (int rid, int sid, float val)
+OSC::sel_sendfader (int id, float val, lo_message msg)
 {
-       if (!session) {
-               return -1;
-       }
-
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
-
-       if (!r) {
-               return -1;
-       }
-
-       /* revert to zero-based counting */
-
-       if (sid > 0) {
-               --sid;
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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;
+               }
 
-       boost::shared_ptr<Processor> p = r->nth_send (sid);
-
-       if (p) {
-               boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
-               boost::shared_ptr<Amp> a = s->amp();
-
-               if (a) {
-                       a->set_gain (val, this);
+               if (s->send_level_controllable (id)) {
+                       s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+                       return 0;
                }
        }
-       return 0;
+       return sel_send_fail ("send_gain", id, 0, lo_message_get_source (msg));
 }
 
 int
-OSC::route_set_send_gain_dB (int rid, int sid, float val)
+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<Route> r = session->route_by_remote_id (rid);
+       if (s) {
 
-       if (!r) {
-               return -1;
-       }
+               /* revert to zero-based counting */
 
-       /* revert to zero-based counting */
+               if (sid > 0) {
+                       --sid;
+               }
 
-       if (sid > 0) {
-               --sid;
-       }
+               if (s->send_enable_controllable (sid)) {
+                       s->send_enable_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
+                       return 0;
+               }
 
-       boost::shared_ptr<Processor> p = r->nth_send (sid);
+               if (s->send_level_controllable (sid)) {
+                       return 0;
+               }
 
-       if (p) {
-               boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
-               boost::shared_ptr<Amp> a = s->amp();
+       }
+
+       return -1;
+}
 
-               if (a) {
-                       a->set_gain (dB_to_coefficient (val), this);
+int
+OSC::sel_sendenable (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (id > 0) {
+                       --id;
+               }
+               if (s->send_enable_controllable (id)) {
+                       s->send_enable_controllable (id)->set_value (val, PBD::Controllable::NoGroup);
+                       return 0;
+               }
+               if (s->send_level_controllable (id)) {
+                       return sel_send_fail ("send_enable", id + 1, 1, lo_message_get_source (msg));
                }
        }
-       return 0;
+       return sel_send_fail ("send_enable", id + 1, 0, lo_message_get_source (msg));
 }
 
 int
-OSC::route_plugin_parameter (int rid, int piid, int par, float val)
+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<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
 
        if (!r) {
-               PBD::error << "OSC: Invalid Remote Control ID '" << rid << "'" << endmsg;
+               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 '" << rid << "'" << endmsg;
+               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 '" << rid << "' is not a Plugin." << endmsg;
+               PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
                return -1;
        }
 
@@ -1072,39 +2566,41 @@ OSC::route_plugin_parameter (int rid, int piid, int par, float val)
        uint32_t controlid = pip->nth_parameter (par,ok);
 
        if (!ok) {
-               PBD::error << "OSC: Cannot find parameter # " << par <<  " for plugin # " << piid << " on RID '" << rid << "'" << endmsg;
+               PBD::error << "OSC: Cannot find parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "'" << endmsg;
                return -1;
        }
 
        if (!pip->parameter_is_input(controlid)) {
-               PBD::error << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << rid << "' is not a control input" << endmsg;
+               PBD::error << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "' is not a control input" << endmsg;
                return -1;
        }
 
        ParameterDescriptor pd;
        pi->plugin()->get_parameter_descriptor (controlid,pd);
 
-       if (val >= pd.lower && val < pd.upper) {
+       if (val >= pd.lower && val <= pd.upper) {
 
                boost::shared_ptr<AutomationControl> c = pi->automation_control (Evoral::Parameter(PluginAutomation, 0, controlid));
                // cerr << "parameter:" << redi->describe_parameter(controlid) << " val:" << val << "\n";
-               c->set_value (val);
+               c->set_value (val, PBD::Controllable::NoGroup);
        } else {
-               PBD::warning << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << rid << "' is out of range" << endmsg;
+               PBD::warning << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "' is out of range" << endmsg;
                PBD::info << "OSC: Valid range min=" << pd.lower << " max=" << pd.upper << endmsg;
        }
 
        return 0;
 }
 
+//prints to cerr only
 int
-OSC::route_plugin_parameter_print (int rid, int piid, int par)
+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<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
 
        if (!r) {
                return -1;
@@ -1145,10 +2641,446 @@ OSC::route_plugin_parameter_print (int rid, int piid, int par)
        return 0;
 }
 
+// select
+
+int
+OSC::sel_pan_elevation (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->pan_elevation_control()) {
+                       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));
+}
+
+int
+OSC::sel_pan_frontback (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->pan_frontback_control()) {
+                       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));
+}
+
+int
+OSC::sel_pan_lfe (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->pan_lfe_control()) {
+                       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));
+}
+
+// compressor control
+int
+OSC::sel_comp_enable (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->comp_enable_controllable()) {
+                       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));
+}
+
+int
+OSC::sel_comp_threshold (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->comp_threshold_controllable()) {
+                       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));
+}
+
+int
+OSC::sel_comp_speed (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->comp_speed_controllable()) {
+                       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));
+}
+
+int
+OSC::sel_comp_mode (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->comp_mode_controllable()) {
+                       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));
+}
+
+int
+OSC::sel_comp_makeup (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               if (s->comp_makeup_controllable()) {
+                       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, lo_message_get_source (msg));
+}
+
+// EQ control
+
+int
+OSC::sel_eq_enable (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_hpf (float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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 ("eq_hpf", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_gain (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (msg));
+       } else {
+               s = _select;
+       }
+       if (s) {
+               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_send_fail ("eq_gain", id + 1, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_freq (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_q (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_shape (int id, float val, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+       boost::shared_ptr<Stripable> s;
+       if (sur->expand_enable) {
+               s = get_strip (sur->expand, lo_message_get_source (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, lo_message_get_source (msg));
+}
+
+void
+OSC::gui_selection_changed ()
+{
+       boost::shared_ptr<Stripable> strip = ControlProtocol::first_selected_stripable();
+
+       if (strip) {
+               _select = strip;
+               for (uint32_t it = 0; it < _surface.size(); ++it) {
+                       OSCSurface* sur = &_surface[it];
+                       if(!sur->expand_enable) {
+                               lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
+                               _strip_select (strip, addr);
+                       }
+               }
+       }
+}
+
+// timer callbacks
+bool
+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;
+                       tick = true;
+               }
+       }
+
+       for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end(); x++) {
+
+               OSCGlobalObserver* go;
+
+               if ((go = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
+                       go->tick();
+               }
+       }
+       for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); x++) {
+
+               OSCRouteObserver* ro;
+
+               if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+                       ro->tick();
+               }
+       }
+       for (uint32_t it = 0; it < _surface.size(); it++) {
+               OSCSurface* sur = &_surface[it];
+               OSCSelectObserver* so;
+               if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
+                       so->tick();
+               }
+       }
+       return true;
+}
+
+int
+OSC::route_send_fail (string path, uint32_t ssid, float val, lo_address addr)
+{
+       OSCSurface *sur = get_surface(addr);
+
+       ostringstream os;
+       lo_message reply;
+       if (ssid) {
+               reply = lo_message_new ();
+               if (sur->feedback[2]) {
+                       os << "/strip/" << path << "/" << ssid;
+               } else {
+                       os << "/strip/" << path;
+                       lo_message_add_int32 (reply, ssid);
+               }
+               string str_pth = os.str();
+               lo_message_add_float (reply, (float) val);
+
+               lo_send_message (addr, str_pth.c_str(), reply);
+               lo_message_free (reply);
+       }
+       if ((_select == get_strip (ssid, addr)) || ((sur->expand == ssid) && (sur->expand_enable))) {
+               os.str("");
+               os << "/select/" << path;
+               string sel_pth = os.str();
+               reply = lo_message_new ();
+               lo_message_add_float (reply, (float) val);
+               lo_send_message (addr, sel_pth.c_str(), reply);
+               lo_message_free (reply);
+       }
+
+       return 0;
+}
+
+int
+OSC::sel_fail (string path, float val, lo_address addr)
+{
+       ostringstream os;
+       os.str("");
+       os << "/select/" << path;
+       string sel_pth = os.str();
+       lo_message reply = lo_message_new ();
+       lo_message_add_float (reply, (float) val);
+       lo_send_message (addr, sel_pth.c_str(), reply);
+       lo_message_free (reply);
+
+       return 0;
+}
+
+int
+OSC::sel_send_fail (string path, uint32_t id, float val, lo_address addr)
+{
+       OSCSurface *sur = get_surface(addr);
+
+       ostringstream os;
+       lo_message reply;
+       reply = lo_message_new ();
+       if (sur->feedback[2]) {
+               os << "/select/" << path << "/" << id;
+       } else {
+               os << "/select/" << path;
+               lo_message_add_int32 (reply, id);
+       }
+       string str_pth = os.str();
+       lo_message_add_float (reply, (float) val);
+
+       lo_send_message (addr, str_pth.c_str(), reply);
+       lo_message_free (reply);
+
+       return 0;
+}
+
 XMLNode&
 OSC::get_state ()
 {
-       return ControlProtocol::get_state();
+       XMLNode& node (ControlProtocol::get_state());
+       node.add_property("debugmode", (int) _debugmode); // TODO: enum2str
+       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;
 }
 
 int
@@ -1157,6 +3089,120 @@ OSC::set_state (const XMLNode& node, int version)
        if (ControlProtocol::set_state (node, version)) {
                return -1;
        }
+       XMLProperty const * p = node.property (X_("debugmode"));
+       if (p) {
+               _debugmode = 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;
 }
+
+// predicate for sort call in get_sorted_stripables
+struct StripableByPresentationOrder
+{
+       bool operator () (const boost::shared_ptr<Stripable> & a, const boost::shared_ptr<Stripable> & b) const
+       {
+               return a->presentation_info().order() < b->presentation_info().order();
+       }
+
+       bool operator () (const Stripable & a, const Stripable & b) const
+       {
+               return a.presentation_info().order() < b.presentation_info().order();
+       }
+
+       bool operator () (const Stripable * a, const Stripable * b) const
+       {
+               return a->presentation_info().order() < b->presentation_info().order();
+       }
+};
+
+OSC::Sorted
+OSC::get_sorted_stripables(std::bitset<32> types)
+{
+       Sorted sorted;
+
+       // fetch all stripables
+       StripableList stripables;
+
+       session->get_stripables (stripables);
+
+       // Look for stripables that match bit in sur->strip_types
+       for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+
+               boost::shared_ptr<Stripable> s = *it;
+               if ((!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+                       // do nothing... skip it
+               } else {
+
+                       if (types[0] && (s->presentation_info().flags() & PresentationInfo::AudioTrack)) {
+                               sorted.push_back (s);
+                       } else
+                       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);
+                       } else
+                       if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+                               sorted.push_back (s);
+                       } else
+                       if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
+                               sorted.push_back (s);
+                       } else
+                       if (types[8] && (s->presentation_info().flags() & PresentationInfo::Selected)) {
+                               sorted.push_back (s);
+                       } else
+                       if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+                               sorted.push_back (s);
+                       }
+               }
+       }
+       sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
+       // Master/Monitor might be anywhere... we put them at the end - Sorry ;)
+       if (types[5]) {
+               sorted.push_back (session->master_out());
+       }
+       if (types[6]) {
+               sorted.push_back (session->monitor_out());
+       }
+       return sorted;
+}
+