OSC: Paths changed, feedback added, etc.
[ardour.git] / libs / surfaces / osc / osc.cc
index ae91576c9f5ae1ea5880986f7c73ee95fbe8a754..fc798b907448c93c8b92b9628c5fcbb08773f2b2 100644 (file)
@@ -17,8 +17,6 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
 #include <cstdio>
 #include <cstdlib>
 #include <cerrno>
@@ -27,7 +25,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
 
 #include <pbd/convert.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 "osc.h"
 #include "osc_controllable.h"
 #include "osc_route_observer.h"
+#include "osc_global_observer.h"
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -75,7 +76,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)
@@ -83,12 +84,12 @@ 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)
+       , gui (0)
 {
        _instance = this;
 
-       session_loaded (s);
        session->Exported.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::session_exported, this, _1, _2), this);
 }
 
@@ -98,6 +99,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)
 {
@@ -208,34 +220,35 @@ OSC::start ()
        std::string url_file;
 
        if (find_file (ardour_config_search_path(), "osc_url", url_file)) {
-
                _osc_url_file = url_file;
-               ofstream urlfile;
-               urlfile.open(_osc_url_file.c_str(), ios::trunc);
-
-               if (urlfile) {
-                       urlfile << get_server_url () << endl;
-                       urlfile.close();
-               } else {
+               if (g_file_set_contents (_osc_url_file.c_str(), get_server_url().c_str(), -1, NULL)) {
                        cerr << "Couldn't write '" <<  _osc_url_file << "'" <<endl;
                }
        }
 
        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());
+
        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);
@@ -246,15 +259,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
@@ -277,19 +295,11 @@ OSC::stop ()
        BaseUI::quit ();
 
        if (_osc_server) {
-               int fd = lo_server_get_socket_fd(_osc_server);
-               if (fd >=0) {
-                       close(fd);
-               }
                lo_server_free (_osc_server);
                _osc_server = 0;
        }
 
        if (_osc_unix_server) {
-               int fd = lo_server_get_socket_fd(_osc_unix_server);
-               if (fd >=0) {
-                       close(fd);
-               }
                lo_server_free (_osc_unix_server);
                _osc_unix_server = 0;
        }
@@ -302,6 +312,7 @@ OSC::stop ()
                ::g_unlink (_osc_url_file.c_str() );
        }
 
+       periodic_connection.disconnect ();
        // Delete any active route observers
        for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
@@ -314,6 +325,7 @@ OSC::stop ()
                        ++x;
                }
        }
+// Should maybe do global_observers too
 
        return 0;
 }
@@ -335,47 +347,157 @@ 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/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);
-
-               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/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, "/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, "/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);
+               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", "f", temporal_zoom_in);
+               REGISTER_CALLBACK (serv, "/temporal_zoom_out", "f", 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_dn_1_track", "f", scroll_dn_1_track);
+               REGISTER_CALLBACK (serv, "/scroll_up_1_page", "f", scroll_up_1_page);
+               REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "f", 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);
+               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);
+
+
+               /* 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/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/gain", "if", route_set_gain_dB);
+               REGISTER_CALLBACK (serv, "/strip/fader", "if", route_set_gain_fader);
+               REGISTER_CALLBACK (serv, "/strip/trimabs", "if", route_set_trim_abs);
+               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);
+               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/gaindB", "iif", route_set_send_gain_dB);
 
                /* still not-really-standardized query interface */
                //REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
@@ -387,6 +509,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);
        }
 }
 
@@ -435,7 +561,7 @@ 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)
 {
        /* avoid duplicate listens */
 
@@ -445,24 +571,27 @@ 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 sid = get_sid (strip->presentation_info().group_order(), addr);
+       // above is zero based add 1
+       OSCRouteObserver* o = new OSCRouteObserver (strip, addr, sid + 1, 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::drop_route, this, boost::weak_ptr<Stripable> (strip)), this);
 }
 
 void
-OSC::drop_route (boost::weak_ptr<Route> wr)
+OSC::drop_route (boost::weak_ptr<Stripable> wr)
 {
-       boost::shared_ptr<Route> r = wr.lock ();
+       boost::shared_ptr<Stripable> r = wr.lock ();
 
        if (!r) {
                return;
@@ -474,7 +603,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 {
@@ -487,7 +616,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;
 
@@ -498,9 +627,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);
                        }
@@ -545,13 +674,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");
@@ -567,11 +696,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());
                        }
@@ -589,7 +718,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 */
@@ -605,7 +734,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";
 
@@ -616,7 +745,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");
@@ -635,11 +764,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));
@@ -647,11 +776,121 @@ 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;
+               }
+       }
+
+       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 ()
 {
@@ -662,8 +901,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
@@ -671,6 +910,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 //
@@ -740,9 +980,12 @@ OSC::current_value (const char */*path*/, const char */*types*/, lo_arg **/*argv
 void
 OSC::routes_list (lo_message msg)
 {
+       if (!session) {
+               return;
+       }
        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) {
 
@@ -761,13 +1004,14 @@ 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 group ID at this point */
+                       lo_message_add_int32 (reply, r->presentation_info().group_order());
 
                        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
@@ -790,167 +1034,585 @@ OSC::routes_list (lo_message msg)
        lo_message_free (reply);
 }
 
+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, msg, s->gainmode);
+       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 should include s->feedback in whole.
+       global_feedback (s->feedback, 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];
+               }
+       }
+       // No surface create one with default values
+       OSCSurface s;
+       s.remote_url = r_url;
+       s.bank = 1;
+       s.bank_size = 0;
+       s.strip_types = 31; // 31 is tracks, busses, and VCAs (no master/monitor)
+       s.feedback = 0;
+       s.gainmode = 0;
+       //get sorted should go here
+       _surface.push_back (s);
+       return &_surface[_surface.size() - 1];
+}
+
+// setup global feedback for a surface
+void
+OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
+{
+       // first destroy global observer for this surface
+       GlobalObservers::iterator x;
+
+       for (x = global_observers.begin(); x != global_observers.end();) {
+
+               OSCGlobalObserver* ro;
+
+               if ((ro = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
+
+                       int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(lo_message_get_source (msg)));
+
+                       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
+               //OSCSurface *s = get_surface (lo_message_get_source (msg));
+               OSCGlobalObserver* o = new OSCGlobalObserver (*session, lo_message_get_source (msg), gainmode, /*s->*/feedback);
+               global_observers.push_back (o);
+       }
+}
+
+/*
+ * 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)
+{
+       if (!session) {
+               return -1;
+       }
+       //StripableList strips;
+       //session->get_stripables (strips);
+       // no nstripables yet
+       if (!session->nroutes()) {
+               return -1;
+       }
+       // don't include monitor or master in count for now
+       uint32_t nstrips;
+       if (session->monitor_out ()) {
+               nstrips = session->nroutes() - 2;
+       } else {
+               nstrips = session->nroutes() - 1;
+       }
+       // undo all listeners for this url
+       for (int n = 1; n <= (int) nstrips; ++n) {
+
+               boost::shared_ptr<Stripable> stp = session->get_remote_nth_stripable (n, PresentationInfo::Route);
+
+               if (stp) {
+                       end_listen (stp, lo_message_get_source (msg));
+               }
+       }
+
+       OSCSurface *s = get_surface (lo_message_get_source (msg));
+       uint32_t b_size;
+
+       if (!s->bank_size) {
+               // no banking
+               b_size = nstrips;
+       } else {
+               b_size = s->bank_size;
+       }
+
+       // Do limits checking - high end still not quite right
+       if (bank_start < 1) bank_start = 1;
+       if (b_size >= nstrips)  {
+               bank_start = 1;
+       } else if ((bank_start > nstrips)) {
+               bank_start = (uint32_t)((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 (int n = bank_start; n < (int) (b_size + bank_start); ++n) {
+                       // this next will eventually include strip types
+                       boost::shared_ptr<Stripable> stp = session->get_remote_nth_stripable (n, PresentationInfo::Route);
+
+                       if (stp) {
+                       listen_to_route(stp, lo_message_get_source (msg));
+                       }
+               }
+       }
+       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 (uint32_t rid, lo_address addr)
+{
+       OSCSurface *s = get_surface(addr);
+       return rid - s->bank + 1;
+}
+
+uint32_t
+OSC::get_rid (uint32_t sid, lo_address addr)
+{
+       OSCSurface *s = get_surface(addr);
+       return sid + s->bank - 1;
+}
+
 void
 OSC::transport_frame (lo_message msg)
 {
+       if (!session) {
+               return;
+       }
        framepos_t pos = session->transport_frame ();
 
        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);
+}
+
+void
+OSC::transport_speed (lo_message msg)
+{
+       if (!session) {
+               return;
+       }
+       double ts = session->transport_speed ();
+
+       lo_message reply = lo_message_new ();
+       lo_message_add_double (reply, ts);
+
+       lo_send_message (lo_message_get_source (msg), "/transport_speed", reply);
 
        lo_message_free (reply);
 }
 
+void
+OSC::record_enabled (lo_message msg)
+{
+       if (!session) {
+               return;
+       }
+       int re = (int)session->get_record_enabled ();
+
+       lo_message reply = lo_message_new ();
+       lo_message_add_int32 (reply, re);
+
+       lo_send_message (lo_message_get_source (msg), "/record_enabled", reply);
+
+       lo_message_free (reply);
+}
+
+// master and monitor calls
 int
-OSC::route_mute (int rid, int yn)
+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;
+}
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+int
+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;
+}
+
+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)
 {
        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_solo (yn, this);
+       if (s) {
+               if (s->pan_azimuth_control()) {
+                       s->pan_azimuth_control()->set_value (position, PBD::Controllable::NoGroup);
+               }
+               /*boost::shared_ptr<PBD::Controllable> panner = s->pan_azimuth_control();
+               if (panner) {
+                       panner->set_value (position, PBD::Controllable::NoGroup);
+               }*/
        }
 
        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 (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;
+}
 
-       if (r) {
-               r->set_gain (level, this);
+int
+OSC::monitor_set_fader (uint32_t position)
+{
+       if (!session) return -1;
+       boost::shared_ptr<Stripable> s = session->monitor_out();
+       if (s) {
+               if ((position > 799.5) && (position < 800.5)) {
+                       s->gain_control()->set_value (1.0, PBD::Controllable::NoGroup);
+               } else {
+                       s->gain_control()->set_value (slider_position_to_gain_with_max (((float)position/1023), 2.0), PBD::Controllable::NoGroup);
+               }
+       }
+       return 0;
+}
+
+// strip calls
+int
+OSC::route_mute (int ssid, int yn, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+
+       if (s) {
+               s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
        }
 
        return 0;
 }
 
 int
-OSC::route_set_gain_dB (int rid, float dB)
+OSC::route_solo (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
 
-       if (r) {
-               r->set_gain (dB_to_coefficient (dB), this);
+       if (s) {
+               s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
        }
 
        return 0;
 }
 
 int
-OSC::route_set_pan_stereo_position (int rid, float pos)
+OSC::route_recenable (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
 
-       if (r) {
-               boost::shared_ptr<Panner> panner = r->panner();
-               if (panner) {
-                       panner->set_position (pos);
+       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;
+                       }
                }
        }
+       // hmm, not set for whatever reason tell surface
+       return route_send_fail ("/strip/recenable", ssid, msg);
+}
 
-       return 0;
+int
+OSC::route_recsafe (int ssid, int yn, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+       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;
+                       }
+               }
+       }
+       // hmm, not set for whatever reason tell surface
+       return route_send_fail ("/strip/record_safe", ssid, msg);
+}
+
+int
+OSC::route_monitor_input (int ssid, int yn, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+
+       if (s) {
+               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+               if (track) {
+                       track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+               } else {
+                       route_send_fail ("/strip/monitor_input", ssid, msg);
+               }
+
+       }
 
+       return 0;
 }
 
 int
-OSC::route_set_pan_stereo_width (int rid, float pos)
+OSC::route_monitor_disk (int ssid, int yn, lo_message msg)
 {
        if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
 
-       if (r) {
-               boost::shared_ptr<Panner> panner = r->panner();
-               if (panner) {
-                       panner->set_width (pos);
+       if (s) {
+               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+               if (track) {
+                       track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+               } else {
+                       route_send_fail ("/strip/monitor_disk", ssid, msg);
                }
+
        }
 
        return 0;
+}
 
+int
+OSC::route_set_gain_abs (int rid, float level, lo_message msg)
+{
+       if (!session) return -1;
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+
+       if (s) {
+               s->gain_control()->set_value (level, PBD::Controllable::NoGroup);
+       }
+
+       return 0;
 }
 
 int
-OSC::route_set_send_gain_abs (int rid, int sid, float val)
+OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
 {
-       if (!session) {
-               return -1;
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+       if (dB < -192) {
+               return route_set_gain_abs (rid, 0.0, msg);
        }
+       return route_set_gain_abs (rid, dB_to_coefficient (dB), msg);
+}
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+int
+OSC::route_set_gain_fader (int ssid, float pos, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+       if ((pos > 799.5) && (pos < 800.5)) {
+               return route_set_gain_abs (rid, 1.0, msg);
+       } else {
+               return route_set_gain_abs (rid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
+       }
+}
+
+
+int
+OSC::route_set_trim_abs (int ssid, float level, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+
+       if (s) {
+               if (s->trim_control()) {
+                       s->trim_control()->set_value (level, PBD::Controllable::NoGroup);
+               }
 
-       if (!r) {
-               return -1;
        }
 
-       /* revert to zero-based counting */
+       return 0;
+}
 
-       if (sid > 0) {
-               --sid;
+int
+OSC::route_set_trim_dB (int ssid, float dB, lo_message msg)
+{
+       return route_set_trim_abs(ssid, dB_to_coefficient (dB), msg);
+}
+
+
+int
+OSC::route_set_pan_stereo_position (int ssid, float pos, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+
+       if (s) {
+               if(s->pan_azimuth_control()) {
+                       s->pan_azimuth_control()->set_value (pos, PBD::Controllable::NoGroup);
+               }
        }
 
-       boost::shared_ptr<Processor> p = r->nth_send (sid);
+       return 0;
 
-       if (p) {
-               boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
-               boost::shared_ptr<Amp> a = s->amp();
+}
+
+int
+OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg)
+{
+       if (!session) return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
+
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
 
-               if (a) {
-                       a->set_gain (val, this);
+       if (s) {
+               if (s->pan_width_control()) {
+                       s->pan_width_control()->set_value (pos, PBD::Controllable::NoGroup);
                }
        }
+
        return 0;
+
 }
 
 int
-OSC::route_set_send_gain_dB (int rid, int sid, float val)
+OSC::route_set_send_gain_abs (int ssid, int sid, float val, lo_message msg)
 {
        if (!session) {
                return -1;
        }
+       int rid = get_rid (ssid, lo_message_get_source (msg));
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
 
-       if (!r) {
+       if (!s) {
                return -1;
        }
 
@@ -960,26 +1622,27 @@ OSC::route_set_send_gain_dB (int rid, int sid, float val)
                --sid;
        }
 
-       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 (dB_to_coefficient (val), this);
-               }
+       if (s->send_level_controllable (sid)) {
+               s->send_level_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
        }
+
        return 0;
 }
 
 int
-OSC::route_plugin_parameter (int rid, int piid, int par, float val)
+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_plugin_parameter (int ssid, int piid, int par, float val, lo_message msg)
 {
        if (!session)
                return -1;
+       int rid = get_rid (ssid, lo_message_get_source (msg));
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Route> r = session->get_remote_nth_route (rid);
 
        if (!r) {
                PBD::error << "OSC: Invalid Remote Control ID '" << rid << "'" << endmsg;
@@ -1018,11 +1681,11 @@ OSC::route_plugin_parameter (int rid, int piid, int par, float val)
        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::info << "OSC: Valid range min=" << pd.lower << " max=" << pd.upper << endmsg;
@@ -1032,13 +1695,14 @@ OSC::route_plugin_parameter (int rid, int piid, int par, float val)
 }
 
 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;
        }
+       int rid = get_rid (ssid, lo_message_get_source (msg));
 
-       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+       boost::shared_ptr<Route> r = session->get_remote_nth_route (rid);
 
        if (!r) {
                return -1;
@@ -1079,28 +1743,67 @@ OSC::route_plugin_parameter_print (int rid, int piid, int par)
        return 0;
 }
 
+// timer callbacks
+bool
+OSC::periodic (void)
+{
+       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();
+               }
+       }
+
+       return true;
+}
+
+int
+OSC::route_send_fail (string path, uint32_t ssid, lo_message msg)
+{
+       OSCSurface *sur = get_surface(lo_message_get_source (msg));
+
+       lo_message reply = lo_message_new ();
+       if (sur->feedback[2]) {
+               ostringstream os;
+               os << path << "/" << ssid;
+               path = os.str();
+       } else {
+               lo_message_add_int32 (reply, ssid);
+       }
+       lo_message_add_float (reply, (float) 0);
+
+       lo_send_message (lo_message_get_source (msg), path.c_str(), reply);
+       lo_message_free (reply);
+       return 0;
+}
+
 XMLNode&
 OSC::get_state ()
 {
        XMLNode& node (ControlProtocol::get_state());
-
-       node.add_property (X_("feedback"), _send_route_changes ? "1" : "0");
+       node.add_property("debugmode", (int) _debugmode); // TODO: enum2str
        return node;
 }
 
 int
-OSC::set_state (const XMLNode& node, int /*version*/)
+OSC::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop = node.property (X_("feedback"));
-
-       if (prop) {
-               if (PBD::string_is_affirmative (prop->value())) {
-                       _send_route_changes = true;
-               } else {
-                       _send_route_changes = false;
-               }
-       } else {
-               /* leave it alone */
+       if (ControlProtocol::set_state (node, version)) {
+               return -1;
+       }
+       XMLProperty const * p = node.property (X_("debugmode"));
+       if (p) {
+               _debugmode = OSCDebugMode (PBD::atoi(p->value ()));
        }
 
        return 0;