Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
[ardour.git] / libs / surfaces / osc / osc.cc
index 264ce74f4950514eb7d8ee5ee510dc582c52f5a8..8b57dc0c3e14007f8a30327fd1fcfc29a2ad76f3 100644 (file)
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 
 #include <pbd/pthread_utils.h>
 #include <pbd/file_utils.h>
-#include <pbd/filesystem.h>
 #include <pbd/failed_constructor.h>
 
-#include <ardour/session.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.h>
-#include <ardour/dB.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/amp.h"
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/dB.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/panner.h"
+#include "ardour/plugin.h"
+#include "ardour/send.h"
 
 #include "osc.h"
 #include "osc_controllable.h"
+#include "osc_route_observer.h"
 #include "i18n.h"
 
 using namespace ARDOUR;
-using namespace sigc;
 using namespace std;
+using namespace Glib;
 
+#include "pbd/abstract_ui.cc" // instantiate template
 
+OSC* OSC::_instance = 0;
+
+#ifdef DEBUG
 static void error_callback(int num, const char *m, const char *path)
 {
-#ifdef DEBUG
        fprintf(stderr, "liblo server error %d in path %s: %s\n", num, path, m);
-#endif
 }
+#else
+static void error_callback(int, const char *, const char *)
+{
+
+}
+#endif
 
 OSC::OSC (Session& s, uint32_t port)
        : ControlProtocol (s, "OSC")
+       , AbstractUI<OSCUIRequest> ("osc")
        , _port(port)
 {
+       _instance = this;
        _shutdown = false;
        _osc_server = 0;
        _osc_unix_server = 0;
-       _osc_thread = 0;
        _namespace_root = "/ardour";
        _send_route_changes = true;
 
+       /* glibmm hack */
+       local_server = 0;
+       remote_server = 0;
+
        // "Application Hooks"
        session_loaded (s);
-       session->Exported.connect( mem_fun( *this, &OSC::session_exported ) );
-
-       /* catch up with existing routes */
-
-       boost::shared_ptr<RouteList> rl = session->get_routes ();
-       route_added (*(rl.get()));
-
-       // session->RouteAdded.connect (mem_fun (*this, &OSC::route_added));
+       session->Exported.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::session_exported, this, _1, _2), this);
 }
 
 OSC::~OSC()
 {
        stop ();
+       _instance = 0;
+}
+
+void
+OSC::do_request (OSCUIRequest* req)
+{
+       if (req->type == CallSlot) {
+
+               call_slot (MISSING_INVALIDATOR, req->the_slot);
+
+       } else if (req->type == Quit) {
+
+               stop ();
+       }
 }
 
 int
@@ -128,15 +153,24 @@ OSC::start ()
        for (int j=0; j < 20; ++j) {
                snprintf(tmpstr, sizeof(tmpstr), "%d", _port);
                
+               //if ((_osc_server = lo_server_new_with_proto (tmpstr, LO_TCP, error_callback))) {
+               //      break;
+               //}
+               
                if ((_osc_server = lo_server_new (tmpstr, error_callback))) {
                        break;
                }
+
 #ifdef DEBUG           
                cerr << "can't get osc at port: " << _port << endl;
 #endif
                _port++;
                continue;
        }
+
+       if (!_osc_server) {
+               return 1;
+       }
        
 #ifdef ARDOUR_OSC_UNIX_SERVER
        
@@ -148,7 +182,7 @@ OSC::start ()
        int fd = mkstemp(tmpstr);
        
        if (fd >= 0 ) {
-               unlink (tmpstr);
+               ::g_unlink (tmpstr);
                close (fd);
                
                _osc_unix_server = lo_server_new (tmpstr, error_callback);
@@ -159,22 +193,20 @@ OSC::start ()
        }
 #endif
        
-       cerr << "OSC @ " << get_server_url () << endl;
+       PBD::info << "OSC @ " << get_server_url () << endmsg;
 
-       PBD::sys::path url_file;
+       std::string url_file;
 
-       if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-                                     "osc_url", url_file)) {
-               _osc_url_file = url_file.to_string();
+       if (find_file_in_search_path (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 )
-               {
+               
+               if (urlfile) {
                        urlfile << get_server_url () << endl;
                        urlfile.close();
-               }
-               else
-               {  
+               } else {  
                        cerr << "Couldn't write '" <<  _osc_url_file << "'" <<endl;
                }
        }
@@ -182,35 +214,97 @@ OSC::start ()
        register_callbacks();
        
        // lo_server_thread_add_method(_sthread, NULL, NULL, OSC::_dummy_handler, this);
-               
-       if (!init_osc_thread()) {
-               return -1;
-       }
+
+       /* startup the event loop thread */
+
+       BaseUI::run ();
+
        return 0;
 }
 
+void
+OSC::thread_init ()
+{
+       pthread_set_name (X_("OSC"));
+
+       if (_osc_unix_server) {
+               Glib::RefPtr<IOSource> src = IOSource::create (lo_server_get_socket_fd (_osc_unix_server), IO_IN|IO_HUP|IO_ERR);
+               src->connect (sigc::bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_unix_server));
+               src->attach (_main_loop->get_context());
+               local_server = src->gobj();
+               g_source_ref (local_server);
+       }
+
+       if (_osc_server) {
+               Glib::RefPtr<IOSource> src  = IOSource::create (lo_server_get_socket_fd (_osc_server), IO_IN|IO_HUP|IO_ERR);
+               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);
+}
+
 int
 OSC::stop ()
-{      
-       if (_osc_server == 0) {
-               /* already stopped */
-               return 0;
+{
+       /* stop main loop */
+
+       if (local_server) {
+               g_source_destroy (local_server);
+               g_source_unref (local_server);
+               local_server = 0;
        }
 
-       // stop server thread
-       terminate_osc_thread();
+       if (remote_server) {
+               g_source_destroy (remote_server);
+               g_source_unref (remote_server);
+               remote_server = 0;
+       }
 
-       lo_server_free (_osc_server);
-       _osc_server = 0;
+       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;
+       }
        
        if (!_osc_unix_socket_path.empty()) {
-               // unlink it
-               unlink(_osc_unix_socket_path.c_str());
+               ::g_unlink (_osc_unix_socket_path.c_str());
        }
        
-       if (!  _osc_url_file.empty() ) {
-               unlink(_osc_url_file.c_str() );
+       if (!_osc_url_file.empty() ) {
+               ::g_unlink (_osc_url_file.c_str() );
        }
+
+       // Delete any active route observers
+       for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
+
+               OSCRouteObserver* rc;
+               
+               if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+                       delete *x;
+                       x = route_observers.erase (x);
+               } else {
+                       ++x;
+               }
+       }
+       
        return 0;
 }
 
@@ -234,9 +328,10 @@ OSC::register_callbacks()
                /* 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);
@@ -246,7 +341,9 @@ OSC::register_callbacks()
                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);
@@ -262,77 +359,40 @@ OSC::register_callbacks()
                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);
 
-#if 0
-               REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
-               REGISTER_CALLBACK (serv, "/ardour/set", "", set);
-#endif
+               /* still not-really-standardized query interface */
+               //REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
+               //REGISTER_CALLBACK (serv, "/ardour/set", "", set);
 
-#if 0
                // un/register_update args= s:ctrl s:returl s:retpath
-               lo_server_add_method(serv, "/register_update", "sss", OSC::global_register_update_handler, this);
-               lo_server_add_method(serv, "/unregister_update", "sss", OSC::global_unregister_update_handler, this);
-               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);
-#endif
+               //lo_server_add_method(serv, "/register_update", "sss", OSC::global_register_update_handler, this);
+               //lo_server_add_method(serv, "/unregister_update", "sss", OSC::global_unregister_update_handler, this);
+               //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);
+
        }
 }
 
 bool
-OSC::init_osc_thread ()
+OSC::osc_input_handler (IOCondition ioc, lo_server srv)
 {
-       // create new thread to run server
-       if (pipe (_request_pipe)) {
-               cerr << "Cannot create osc request signal pipe" <<  strerror (errno) << endl;
+       if (ioc & ~IO_IN) {
                return false;
        }
 
-       if (fcntl (_request_pipe[0], F_SETFL, O_NONBLOCK)) {
-               cerr << "osc: cannot set O_NONBLOCK on signal read pipe " << strerror (errno) << endl;
-               return false;
+       if (ioc & IO_IN) {
+               lo_server_recv (srv);
        }
 
-       if (fcntl (_request_pipe[1], F_SETFL, O_NONBLOCK)) {
-               cerr << "osc: cannot set O_NONBLOCK on signal write pipe " << strerror (errno) << endl;
-               return false;
-       }
-       
-       pthread_attr_t attr;
-       pthread_attr_init(&attr);
-       pthread_attr_setstacksize(&attr, 500000);
-
-       pthread_create_and_store (X_("OSC"), &_osc_thread, &attr, &OSC::_osc_receiver, this);
-       if (!_osc_thread) {
-               return false;
-       }
-       pthread_attr_destroy(&attr);
-
-       //pthread_detach (_osc_thread);
        return true;
 }
 
-void
-OSC::terminate_osc_thread ()
-{
-       void* status;
-
-       _shutdown = true;
-       
-       poke_osc_thread ();
-
-       pthread_join (_osc_thread, &status);
-}
-
-void
-OSC::poke_osc_thread ()
-{
-       char c;
-
-       if (write (_request_pipe[1], &c, 1) != 1) {
-               cerr << "cannot send signal to osc thread! " <<  strerror (errno) << endl;
-       }
-}
-
 std::string
 OSC::get_server_url()
 {
@@ -363,107 +423,84 @@ OSC::get_unix_server_url()
        return url;
 }
 
+void
+OSC::listen_to_route (boost::shared_ptr<Route> route, lo_address addr)
+{
+       /* avoid duplicate listens */
+       
+       for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); ++x) {
+               
+               OSCRouteObserver* ro;
 
-/* server thread */
+               if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
 
-void *
-OSC::_osc_receiver(void * arg)
-{
-       PBD::notify_gui_about_thread_creation (pthread_self(), X_("OSC"));
+                       int res = strcmp(lo_address_get_hostname(ro->address()), lo_address_get_hostname(addr));
+                       
+                       if (ro->route() == route && res == 0) {
+                               return;
+                       }
+               }
+       }
 
-       static_cast<OSC*> (arg)->osc_receiver();
-       return 0;
+       OSCRouteObserver* o = new OSCRouteObserver (route, addr);
+       route_observers.push_back (o);
+
+       route->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::drop_route, this, boost::weak_ptr<Route> (route)), this);
 }
 
 void
-OSC::osc_receiver()
+OSC::drop_route (boost::weak_ptr<Route> wr)
 {
-       struct pollfd pfd[3];
-       int fds[3];
-       lo_server srvs[3];
-       int nfds = 0;
-       int timeout = -1;
-       int ret;
-       
-       fds[0] = _request_pipe[0];
-       nfds++;
-       
-       if (_osc_server && lo_server_get_socket_fd(_osc_server) >= 0) {
-               fds[nfds] = lo_server_get_socket_fd(_osc_server);
-               srvs[nfds] = _osc_server;
-               nfds++;
-       }
+       boost::shared_ptr<Route> r = wr.lock ();
 
-       if (_osc_unix_server && lo_server_get_socket_fd(_osc_unix_server) >= 0) {
-               fds[nfds] = lo_server_get_socket_fd(_osc_unix_server);
-               srvs[nfds] = _osc_unix_server;
-               nfds++;
+       if (!r) {
+               return;
        }
-       
-       
-       while (!_shutdown) {
 
-               for (int i=0; i < nfds; ++i) {
-                       pfd[i].fd = fds[i];
-                       pfd[i].events = POLLIN|POLLPRI|POLLHUP|POLLERR;
-                       pfd[i].revents = 0;
-               }
-               
-       again:
-               //cerr << "poll on " << nfds << " for " << timeout << endl;
-               if ((ret = poll (pfd, nfds, timeout)) < 0) {
-                       if (errno == EINTR) {
-                               /* gdb at work, perhaps */
-                               goto again;
-                       }
-                       
-                       cerr << "OSC thread poll failed: " <<  strerror (errno) << endl;
-                       
-                       break;
-               }
+       for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
-               //cerr << "poll returned " << ret << "  pfd[0].revents = " << pfd[0].revents << "  pfd[1].revents = " << pfd[1].revents << endl;
-               
-               if (_shutdown) {
-                       break;
-               }
+               OSCRouteObserver* rc;
                
-               if ((pfd[0].revents & ~POLLIN)) {
-                       cerr << "OSC: error polling extra port" << endl;
-                       break;
-               }
-               
-               for (int i=1; i < nfds; ++i) {
-                       if (pfd[i].revents & POLLIN)
-                       {
-                               // this invokes callbacks
-                               // cerr << "invoking recv on " << pfd[i].fd << endl;
-                               lo_server_recv(srvs[i]);
+               if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+                 
+                       if (rc->route() == r) {
+                               delete *x;
+                               x = route_observers.erase (x);
+                       } else {
+                               ++x;
                        }
+               } else {
+                       ++x;
                }
-
        }
+}
 
-       //cerr << "SL engine shutdown" << endl;
+void
+OSC::end_listen (boost::shared_ptr<Route> r, lo_address addr)
+{
+       RouteObservers::iterator x;
        
-       if (_osc_server) {
-               int fd = lo_server_get_socket_fd(_osc_server);
-               if (fd >=0) {
-                       // hack around
-                       close(fd);
-               }
-               lo_server_free (_osc_server);
-               _osc_server = 0;
-       }
+       // Remove the route observers
+       for (x = route_observers.begin(); x != route_observers.end();) {
 
-       if (_osc_unix_server) {
-               cerr << "freeing unix server" << endl;
-               lo_server_free (_osc_unix_server);
-               _osc_unix_server = 0;
+               OSCRouteObserver* ro;
+               
+               if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
+                 
+                       int res = strcmp(lo_address_get_hostname(ro->address()), lo_address_get_hostname(addr));
+
+                       if (ro->route() == r && res == 0) {
+                               delete *x;
+                               x = route_observers.erase (x);
+                       }
+                       else {
+                               ++x;
+                       }
+               }
+               else {
+                       ++x;
+               }
        }
-       
-       close(_request_pipe[0]);
-       close(_request_pipe[1]);
 }
 
 void
@@ -541,13 +578,13 @@ 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 */
 
-       cerr << "Received a message, path = " << path << " types = \"" 
-            << (types ? types : "NULL") << '"' << endl;
+       //cerr << "Received a message, path = " << path << " types = \"" 
+       //     << (types ? types : "NULL") << '"' << endl;
 
        /* 15 for /#current_value plus 2 for /<path> */
 
@@ -584,6 +621,8 @@ OSC::catchall (const char *path, const char *types, lo_arg **argv, int argc, lo_
 
                lo_send_message (lo_message_get_source (msg), "#reply", reply);
                lo_message_free (reply);
+               
+               ret = 0;
 
        } else if (strcmp (path, "/routes/ignore") == 0) {
 
@@ -595,130 +634,32 @@ OSC::catchall (const char *path, const char *types, lo_arg **argv, int argc, lo_
                                end_listen (r, lo_message_get_source (msg));
                        }
                }
-       }
+               
+               ret = 0;        
+       } 
 
        return ret;
 }
 
 void
-OSC::route_added (RouteList& rl)
+OSC::update_clock ()
 {
+  
 }
 
+// "Application Hook" Handlers //
 void
-OSC::listen_to_route (boost::shared_ptr<Route> route, lo_address addr)
-{
-       Controllables::iterator x;
-       bool route_exists = false;
-
-       cerr << "listen to route\n";
-
-       /* avoid duplicate listens */
-       
-       for (x = controllables.begin(); x != controllables.end(); ++x) {
-               
-               OSCRouteControllable* rc;
-
-               if ((rc = dynamic_cast<OSCRouteControllable*>(*x)) != 0) {
-                       
-                       if (rc->route() == route) {
-                               route_exists = true;
-                               
-                               /* XXX NEED lo_address_equal() */
-                               
-                               if (rc->address() == addr) {
-                                       return;
-                               }
-                       }
-               }
-       }
-
-       cerr << "listener binding to signals\n";
-
-       OSCControllable* c;
-       string path;
-
-       path = X_("/route/solo");
-       c = new OSCRouteControllable (addr, path, route->solo_control(), route);
-       controllables.push_back (c);
-
-       path = X_("/route/mute");
-       c = new OSCRouteControllable (addr, path, route->mute_control(), route);
-       controllables.push_back (c);
-
-       path = X_("/route/gain");
-       c = new OSCRouteControllable (addr, path, route->gain_control(), route);
-       controllables.push_back (c);
-
-       cerr << "Now have " << controllables.size() << " controllables\n";
-
-       /* if there is no existing controllable related to this route, make sure we clean up
-          if it is ever deleted.
-       */
-       
-       if (!route_exists) {
-               route->GoingAway.connect (bind (mem_fun (*this, &OSC::drop_route), boost::weak_ptr<Route> (route)));
-       }
-}
-
-void
-OSC::drop_route (boost::weak_ptr<Route> wr)
+OSC::session_loaded (Session& s)
 {
-       boost::shared_ptr<Route> r = wr.lock ();
-
-       if (!r) {
-               return;
-       }
-
-       for (Controllables::iterator x = controllables.begin(); x != controllables.end();) {
-
-               OSCRouteControllable* rc;
-               
-               if ((rc = dynamic_cast<OSCRouteControllable*>(*x)) != 0) {
-                       if (rc->route() == r) {
-                               delete *x;
-                               x = controllables.erase (x);
-                       } else {
-                               ++x;
-                       }
-               } else {
-                       ++x;
-               }
-       }
+       lo_address listener = lo_address_new (NULL, "7770");
+       lo_send (listener, "/session/loaded", "ss", s.path().c_str(), s.name().c_str());
 }
 
 void
-OSC::end_listen (boost::shared_ptr<Route> r, lo_address addr)
+OSC::session_exported (std::string path, std::string name)
 {
-       Controllables::iterator x;
-
-       for (x = controllables.begin(); x != controllables.end(); ++x) {
-
-               OSCRouteControllable* rc;
-               
-               if ((rc = dynamic_cast<OSCRouteControllable*>(*x)) != 0) {
-
-                       /* XXX NEED lo_address_equal () */
-
-                       if (rc->route() == r && rc->address() == addr) {
-                               controllables.erase (x);
-                               return;
-                       }
-               }
-       }
-}
-
-// "Application Hook" Handlers //
-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() );
-}
-
-void
-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 listener = lo_address_new (NULL, "7770");
+       lo_send (listener, "/session/exported", "ss", path.c_str(), name.c_str());
 }
 
 // end "Application Hook" Handlers //
@@ -726,7 +667,7 @@ OSC::session_exported( std::string path, std::string name ) {
 /* path callbacks */
 
 int 
-OSC::current_value (const char *path, const char *types, lo_arg **argv, int argc, void *data, void* user_data
+OSC::current_value (const char */*path*/, const char */*types*/, lo_arg **/*argv*/, int /*argc*/, void */*data*/, void* /*user_data*/
 { 
 #if 0
        const char* returl;
@@ -785,6 +726,72 @@ OSC::current_value (const char *path, const char *types, lo_arg **argv, int argc
        return 0;
 }
 
+void
+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);
+               
+               if (r) {
+
+                       lo_message reply = lo_message_new ();
+               
+                       if (boost::dynamic_pointer_cast<AudioTrack>(r)) {
+                               lo_message_add_string (reply, "AT");
+                       } else if (boost::dynamic_pointer_cast<MidiTrack>(r)) {
+                               lo_message_add_string (reply, "MT");
+                       } else {
+                               lo_message_add_string (reply, "B");
+                       }
+                       
+                       lo_message_add_string (reply, r->name().c_str());
+                       lo_message_add_int32 (reply, r->n_inputs().n_audio());
+                       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());
+                       
+                       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());
+                       }
+
+                       //Automatically listen to routes listed
+                       listen_to_route(r, lo_message_get_source (msg));
+
+                       lo_send_message (lo_message_get_source (msg), "#reply", reply);
+                       lo_message_free (reply);
+               }
+       }
+       
+       // Send end of listing message
+       lo_message reply = lo_message_new ();
+
+       lo_message_add_string (reply, "end_route_list");
+       lo_message_add_int64 (reply, session->frame_rate());
+       lo_message_add_int64 (reply, session->current_end_frame());
+       
+       lo_send_message (lo_message_get_source (msg), "#reply", reply);
+       
+       lo_message_free (reply);
+}
+
+void
+OSC::transport_frame (lo_message msg)
+{
+               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_message_free (reply);
+}
+
 int
 OSC::route_mute (int rid, int yn)
 {
@@ -795,6 +802,7 @@ OSC::route_mute (int rid, int yn)
        if (r) {
                r->set_mute (yn, this);
        }
+       
        return 0;
 }
 
@@ -808,6 +816,7 @@ OSC::route_solo (int rid, int yn)
        if (r) {
                r->set_solo (yn, this);
        }
+       
        return 0;
 }
 
@@ -819,8 +828,9 @@ OSC::route_recenable (int rid, int yn)
        boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
 
        if (r) {
-               r->set_record_enable (yn, this);
+               r->set_record_enabled (yn, this);
        }
+       
        return 0;
 }
 
@@ -852,14 +862,214 @@ OSC::route_set_gain_dB (int rid, float dB)
        return 0;
 }
 
+int
+OSC::route_set_pan_stereo_position (int rid, float pos)
+{
+       if (!session) return -1;
+
+       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);
+                }
+       }
+       
+       return 0;
+
+}
+
+int
+OSC::route_set_pan_stereo_width (int rid, float pos)
+{
+       if (!session) return -1;
+
+       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+
+       if (r) {
+                boost::shared_ptr<Panner> panner = r->panner();
+                if (panner) {
+                        panner->set_width (pos);
+                }
+       }
+       
+       return 0;
+
+}
+
+int
+OSC::route_set_send_gain_abs (int rid, int sid, float val)
+{
+        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;
+       }
+
+       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);
+               }
+       }
+       return 0;
+}
+
+int
+OSC::route_set_send_gain_dB (int rid, int sid, float val)
+{
+        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;
+       }
+
+       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);
+               }
+       }
+       return 0;
+}
+
+int
+OSC::route_plugin_parameter (int rid, int piid, int par, float val)
+{
+        if (!session) { 
+                return -1;
+        }
+
+        boost::shared_ptr<Route> r = session->route_by_remote_id (rid);  
+
+        if (!r) {
+                return -1;
+        }
+
+        boost::shared_ptr<Processor> redi=r->nth_processor (piid);
+        
+        if (!redi) {
+                return -1;
+        }
+
+        boost::shared_ptr<PluginInsert> pi;
+        
+        if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+                return -1;
+        }
+
+        boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+        bool ok=false;
+        
+        uint32_t controlid = pip->nth_parameter (par,ok);
+        
+        if (!ok) {
+                return -1;
+        }
+
+        Plugin::ParameterDescriptor pd;
+        pi->plugin()->get_parameter_descriptor (controlid,pd);
+
+        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);
+        }  
+
+        return 0;
+}
+
+int
+OSC::route_plugin_parameter_print (int rid, int piid, int par)
+{
+        if (!session) { 
+                return -1;
+        }
+
+        boost::shared_ptr<Route> r = session->route_by_remote_id (rid);  
+
+        if (!r) {
+                return -1;
+        }
+
+        boost::shared_ptr<Processor> redi=r->nth_processor (piid);
+        
+        if (!redi) {
+                return -1;
+        }
+
+        boost::shared_ptr<PluginInsert> pi;
+        
+        if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+                return -1;
+        }
+        
+        boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
+        bool ok=false;
+        
+        uint32_t controlid = pip->nth_parameter (par,ok);
+        
+        if (!ok) {
+                return -1;
+        }
+
+        Plugin::ParameterDescriptor pd;
+
+        if (pi->plugin()->get_parameter_descriptor (controlid, pd) == 0) {
+                boost::shared_ptr<AutomationControl> c = pi->automation_control (Evoral::Parameter(PluginAutomation, 0, controlid));
+                
+                cerr << "parameter:     " << redi->describe_parameter(controlid)  << "\n";
+                cerr << "current value: " << c->get_value ();
+                cerr << "lower value:   " << pd.lower << "\n";
+                cerr << "upper value:   " << pd.upper << "\n";
+        }
+
+        return 0;
+}
+
 XMLNode& 
 OSC::get_state () 
 {
-       return *(new XMLNode ("OSC"));
+       XMLNode* node = new XMLNode ("Protocol"); 
+
+       node->add_property (X_("name"), "Open Sound Control (OSC)");
+       node->add_property (X_("feedback"), _send_route_changes ? "1" : "0");
+
+       return *node;
 }
-               
+
 int 
-OSC::set_state (const XMLNode&)
+OSC::set_state (const XMLNode&, int /*version*/)
 {
        return 0;
 }