Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...

[ardour.git] / libs / ardour / osc.cc

diff --git a/libs/ardour/osc.cc b/libs/ardour/osc.cc
index b0bd35b8c69faa6c673336a93828ef1cca17a60e..ffd2df63beae0e30394dfd1f85697cd53f274827 100644 (file)
--- a/libs/ardour/osc.cc
+++ b/libs/ardour/osc.cc
@@ -28,13 +28,17 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <glibmm/miscutils.h>
+
 #include <pbd/pthread_utils.h>
 #include <pbd/file_utils.h>
+#include <pbd/filesystem.h>
 
 #include <ardour/osc.h>
 #include <ardour/session.h>
 #include <ardour/route.h>
 #include <ardour/audio_track.h>
+#include <ardour/dB.h>
 #include <ardour/filesystem_paths.h>
 
 #include "i18n.h"
@@ -105,10 +109,10 @@ OSC::start ()
        
        cerr << "OSC @ " << get_server_url () << endl;
 
-       sys::path url_file;
+       PBD::sys::path url_file;
 
        if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-                               "osc_url", url_file)) {
+                                     "osc_url", url_file)) {
                _osc_url_file = url_file.to_string();
                ofstream urlfile;
                urlfile.open(_osc_url_file.c_str(), ios::trunc);
@@ -152,9 +156,9 @@ OSC::stop ()
                unlink(_osc_unix_socket_path.c_str());
        }
        
-   if (!  _osc_url_file.empty() ) {
-      unlink(_osc_url_file.c_str() );
-   }
+       if (!  _osc_url_file.empty() ) {
+               unlink(_osc_url_file.c_str() );
+       }
        return 0;
 }
 
@@ -183,6 +187,7 @@ OSC::register_callbacks()
 #define REGISTER_CALLBACK(serv,path,types, function) lo_server_add_method (serv, path, types, OSC::_ ## function, this)
                
                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/goto_start", "", goto_start);
                REGISTER_CALLBACK (serv, "/ardour/goto_end", "", goto_end);
@@ -201,6 +206,12 @@ OSC::register_callbacks()
                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);
+
 #if 0
                REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
                REGISTER_CALLBACK (serv, "/ardour/set", "", set);
@@ -307,7 +318,7 @@ OSC::get_unix_server_url()
 void *
 OSC::_osc_receiver(void * arg)
 {
-       PBD::ThreadCreated (pthread_self(), X_("OSC"));
+       PBD::notify_gui_about_thread_creation (pthread_self(), X_("OSC"));
 
        static_cast<OSC*> (arg)->osc_receiver();
        return 0;
@@ -375,7 +386,7 @@ OSC::osc_receiver()
                        if (pfd[i].revents & POLLIN)
                        {
                                // this invokes callbacks
-                               //cerr << "invoking recv on " << pfd[i].fd << endl;
+                               // cerr << "invoking recv on " << pfd[i].fd << endl;
                                lo_server_recv(srvs[i]);
                        }
                }
@@ -387,7 +398,7 @@ OSC::osc_receiver()
        if (_osc_server) {
                int fd = lo_server_get_socket_fd(_osc_server);
                if (fd >=0) {
-                               // hack around
+                       // hack around
                        close(fd);
                }
                lo_server_free (_osc_server);
@@ -409,6 +420,10 @@ OSC::set_session (Session& s)
 {
        session = &s;
        session->GoingAway.connect (mem_fun (*this, &OSC::session_going_away));
+
+       // "Application Hooks"
+       session_loaded( s );
+       session->Exported.connect( mem_fun( *this, &OSC::session_exported ) );
 }
 
 void
@@ -417,6 +432,21 @@ OSC::session_going_away ()
        session = 0;
 }
 
+// "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() );
+}
+
+// end "Application Hook" Handlers //
+
 /* path callbacks */
 
 int 
@@ -478,3 +508,70 @@ OSC::current_value (const char *path, const char *types, lo_arg **argv, int argc
 #endif
        return 0;
 }
+
+int
+OSC::route_mute (int rid, int yn)
+{
+       if (!session) return -1;
+
+       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+
+       if (r) {
+               r->set_mute (yn, this);
+       }
+       return 0;
+}
+
+int
+OSC::route_solo (int rid, int yn)
+{
+       if (!session) return -1;
+
+       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+
+       if (r) {
+               r->set_solo (yn, this);
+       }
+       return 0;
+}
+
+int
+OSC::route_recenable (int rid, int yn)
+{
+       if (!session) return -1;
+
+       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+
+       if (r) {
+               r->set_record_enable (yn, this);
+       }
+       return 0;
+}
+
+int
+OSC::route_set_gain_abs (int rid, float level)
+{
+       if (!session) return -1;
+
+       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+
+       if (r) {
+               r->set_gain (level, this);
+       }
+
+       return 0;
+}
+
+int
+OSC::route_set_gain_dB (int rid, float dB)
+{
+       if (!session) return -1;
+
+       boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
+
+       if (r) {
+               r->set_gain (dB_to_coefficient (dB), this);
+       }
+
+       return 0;
+}