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

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

diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc
index 042dac1dedded6200ba181a6d0178942f74933e4..f20d89841809017b742cea2d68c8621dd39fa031 100644 (file)
--- a/libs/surfaces/osc/interface.cc
+++ b/libs/surfaces/osc/interface.cc
@@ -1,6 +1,5 @@
 /*
- *   Copyright (C) 2006 Paul Davis 
- *   Copyright (C) 2007 Michael Taht
+ *   Copyright (C) 2009 Paul Davis 
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -18,29 +17,30 @@
  *  
  *   */
 
-#include <control_protocol/control_protocol.h>
+#include "ardour/rc_configuration.h"
+#include "control_protocol/control_protocol.h"
 #include "osc.h"
 
 using namespace ARDOUR;
 
-ControlProtocol*
-new_osc_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+static ControlProtocol*
+new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
 {
        OSC* osc = new OSC (*s, Config->get_osc_port());
-               
+       
        osc->set_active (true);
 
        return osc;
 }
 
-void
-delete_osc_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+static void
+delete_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, ControlProtocol* cp)
 {
        delete cp;
 }
 
-bool
-probe_osc_protocol (ControlProtocolDescriptor* descriptor)
+static bool
+probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/)
 {
        return true; // we can always do OSC
 }
@@ -50,17 +50,12 @@ static ControlProtocolDescriptor osc_descriptor = {
        id : "uri://ardour.org/surfaces/osc:0",
        ptr : 0,
        module : 0,
-       mandatory : 1,
+       mandatory : 0,
        supports_feedback : true,
        probe : probe_osc_protocol,
        initialize : new_osc_protocol,
        destroy : delete_osc_protocol
 };
 
-extern "C" {
-ControlProtocolDescriptor* 
-protocol_descriptor () {
-       return &osc_descriptor;
-}
-}
+extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; }