Cleanup to make it coding style compliant.

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

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 7942bace6dd143e24d1521c493a217182b6a26ee..ae52b26772cd69001c494de1366f9ea33acd2a7b 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -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>
@@ -208,15 +206,8 @@ 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;
                }
        }
@@ -277,19 +268,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;
        }
@@ -353,6 +336,8 @@ OSC::register_callbacks()
                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/transport_speed", "", transport_speed);
+               REGISTER_CALLBACK (serv, "/ardour/record_enabled", "", record_enabled);
                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);
@@ -805,6 +790,33 @@ OSC::transport_frame (lo_message msg)
        lo_message_free (reply);
 }
 
+void
+OSC::transport_speed (lo_message msg)
+{
+       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), "/ardour/transport_speed", reply);
+
+       lo_message_free (reply);
+}
+
+void
+OSC::record_enabled (lo_message msg)
+{
+       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), "/ardour/record_enabled", reply);
+
+       lo_message_free (reply);
+}
+
+
 int
 OSC::route_mute (int rid, int yn)
 {
@@ -827,7 +839,9 @@ OSC::route_solo (int rid, int yn)
        boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
 
        if (r) {
-               r->set_solo (yn, this);
+               boost::shared_ptr<RouteList> rl (new RouteList);
+               rl->push_back (r);
+               session->set_solo (rl, yn);
        }
 
        return 0;
@@ -1098,25 +1112,14 @@ OSC::route_plugin_parameter_print (int rid, int piid, int par)
 XMLNode&
 OSC::get_state ()
 {
-       XMLNode& node (ControlProtocol::get_state());
-
-       node.add_property (X_("feedback"), _send_route_changes ? "1" : "0");
-       return node;
+       return ControlProtocol::get_state();
 }
 
 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;
        }
 
        return 0;