Index: libs/surfaces/osc/osc.cc =================================================================== --- libs/surfaces/osc/osc.cc (revision 8177) +++ libs/surfaces/osc/osc.cc (working copy) @@ -47,6 +47,7 @@ #include "osc.h" #include "osc_controllable.h" +#include "osc_route_observer.h" #include "i18n.h" using namespace ARDOUR; @@ -153,9 +154,14 @@ 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 @@ -190,16 +196,16 @@ if (find_file_in_search_path (ardour_search_path() + system_config_search_path(), "osc_url", url_file)) { + _osc_url_file = url_file.to_string(); 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 << "'" < */ @@ -496,7 +501,19 @@ if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) { current_value_query (path, len, argv, argc, msg); ret = 0; - + } else if (strcmp (path, "/ardour/transport_frame") == 0) { + + framepos_t pos = 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); + + ret = 0; + } else if (strcmp (path, "/routes/listen") == 0) { cerr << "set up listener\n"; @@ -524,6 +541,8 @@ lo_send_message (lo_message_get_source (msg), "#reply", reply); lo_message_free (reply); + + ret = 0; } else if (strcmp (path, "/routes/ignore") == 0) { @@ -535,12 +554,72 @@ end_listen (r, lo_message_get_source (msg)); } } + + ret = 0; + + } else if (strcmp (path, "/routes/list") == 0) { + + for (int n = 0; n < (int) session->nroutes(); ++n) { + + boost::shared_ptr r = session->route_by_remote_id (n); + + if (r) { + + lo_message reply = lo_message_new (); + + if (boost::dynamic_pointer_cast(r)) { + lo_message_add_string (reply, "AT"); + } else if (boost::dynamic_pointer_cast(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(r) + || boost::dynamic_pointer_cast(r)) { + + boost::shared_ptr t = boost::dynamic_pointer_cast(r); + lo_message_add_int32 (reply, t->record_enabled()); + } + + lo_send_message (lo_message_get_source (msg), "#reply", reply); + lo_message_free (reply); + + //Automatically listen to routes listed + listen_to_route(r, lo_message_get_source (msg)); + } + } + + // 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); + + ret = 0; } return ret; } void +OSC::update_clock (){ + +} + +void OSC::listen_to_route (boost::shared_ptr route, lo_address addr) { Controllables::iterator x; @@ -560,8 +639,10 @@ route_exists = true; /* XXX NEED lo_address_equal() */ + int res = strcmp(lo_address_get_hostname(rc->address()), lo_address_get_hostname(addr)); - if (rc->address() == addr) { + if (res == 0) { + cerr << "already listening to route" << endl; return; } } @@ -572,6 +653,15 @@ OSCControllable* c; string path; + + if (boost::dynamic_pointer_cast(route) || boost::dynamic_pointer_cast(route)) { + + boost::shared_ptr track = boost::dynamic_pointer_cast(route); + + path = X_("/route/rec"); + c = new OSCRouteControllable (addr, path, track->rec_enable_control(), track); + controllables.push_back (c); + } path = X_("/route/solo"); c = new OSCRouteControllable (addr, path, route->solo_control(), route); @@ -584,9 +674,14 @@ path = X_("/route/gain"); c = new OSCRouteControllable (addr, path, route->gain_control(), route); controllables.push_back (c); - + cerr << "Now have " << controllables.size() << " controllables\n"; + OSCRouteObserver* o; + + o = new OSCRouteObserver (addr, path, route); + observables.push_back (o); + /* if there is no existing controllable related to this route, make sure we clean up if it is ever deleted. */ @@ -627,22 +722,51 @@ { Controllables::iterator x; - for (x = controllables.begin(); x != controllables.end(); ++x) { + for (x = controllables.begin(); x != controllables.end();) { OSCRouteControllable* rc; if ((rc = dynamic_cast(*x)) != 0) { /* XXX NEED lo_address_equal () */ + if (rc->route() == r && (0 == strcmp(lo_address_get_hostname(rc->address()), lo_address_get_hostname(addr)))){ + delete *x; + x = controllables.erase (x); + } + else { + ++x; + } + } + else { + ++x; + } + } + + Observables::iterator z; + + // Remove the route observers + for (z = observables.begin(); z != observables.end();) { - if (rc->route() == r && rc->address() == addr) { - controllables.erase (x); - return; + OSCRouteObserver* ro; + + if ((ro = dynamic_cast(*z)) != 0) { + + /* XXX NEED lo_address_equal () */ + if (ro->route() == r){ + delete *z; + z = observables.erase (z); } + else { + ++z; + } } + else { + ++z; + } } } + // "Application Hook" Handlers // void OSC::session_loaded( Session& s ) { Index: libs/surfaces/osc/osc_controllable.cc =================================================================== --- libs/surfaces/osc/osc_controllable.cc (revision 8177) +++ libs/surfaces/osc/osc_controllable.cc (working copy) @@ -33,14 +33,15 @@ OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr c) : controllable (c) - , addr (a) , path (p) { + addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a)); c->Changed.connect (changed_connection, MISSING_INVALIDATOR, boost::bind (&OSCControllable::send_change_message, this), OSC::instance()); } OSCControllable::~OSCControllable () { + changed_connection.disconnect(); lo_address_free (addr); } @@ -93,7 +94,8 @@ /* XXX thread issues */ - std::cerr << "ORC: send " << path << " = " << controllable->get_value() << std::endl; + //std::cerr << "ORC: send " << path << " = " << controllable->get_value() << std::endl; + lo_send_message (addr, path.c_str(), msg); lo_message_free (msg); } Index: libs/surfaces/osc/osc.h =================================================================== --- libs/surfaces/osc/osc.h (revision 8177) +++ libs/surfaces/osc/osc.h (working copy) @@ -37,6 +37,7 @@ #include "control_protocol/control_protocol.h" class OSCControllable; +class OSCRouteObserver; namespace ARDOUR { class Session; @@ -213,10 +214,17 @@ void listen_to_route (boost::shared_ptr, lo_address); void end_listen (boost::shared_ptr, lo_address); void drop_route (boost::weak_ptr); + + void route_name_changed (const PBD::PropertyChange&, boost::weak_ptr r, lo_address addr); + + void update_clock (); + typedef std::list Controllables; + typedef std::list Observables; Controllables controllables; + Observables observables; static OSC* _instance; }; Index: libs/surfaces/osc/wscript =================================================================== --- libs/surfaces/osc/wscript (revision 8177) +++ libs/surfaces/osc/wscript (working copy) @@ -24,6 +24,7 @@ obj.source = ''' osc.cc osc_controllable.cc + osc_route_observer.cc interface.cc ''' obj.export_incdirs = ['.']