Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

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

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index afff3cdcd8857576ab645e1c9a5ad75548fb5f51..8b57dc0c3e14007f8a30327fd1fcfc29a2ad76f3 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -28,13 +28,14 @@
 #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/amp.h"
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/audio_track.h"
@@ -43,6 +44,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/panner.h"
 #include "ardour/plugin.h"
+#include "ardour/send.h"
 
 #include "osc.h"
 #include "osc_controllable.h"
@@ -165,6 +167,10 @@ OSC::start ()
                _port++;
                continue;
        }
+
+       if (!_osc_server) {
+               return 1;
+       }
        
 #ifdef ARDOUR_OSC_UNIX_SERVER
        
@@ -176,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);
@@ -187,14 +193,13 @@ 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)) {
+       if (find_file_in_search_path (ardour_config_search_path(), "osc_url", url_file)) {
                
-               _osc_url_file = url_file.to_string();
+               _osc_url_file = url_file;
                ofstream urlfile;
                urlfile.open(_osc_url_file.c_str(), ios::trunc);
                
@@ -280,11 +285,11 @@ OSC::stop ()
        }
        
        if (!_osc_unix_socket_path.empty()) {
-               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() );
+               ::g_unlink (_osc_url_file.c_str() );
        }
 
        // Delete any active route observers
@@ -358,8 +363,8 @@ OSC::register_callbacks()
                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);
 
                /* still not-really-standardized query interface */
                //REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
@@ -893,6 +898,70 @@ OSC::route_set_pan_stereo_width (int rid, float pos)
 
 }
 
+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)
 {
@@ -991,7 +1060,12 @@ OSC::route_plugin_parameter_print (int rid, int piid, int par)
 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