Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...

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

diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index d3625cac51c9207df98b8b034a3aebf2b9d37135..35216da26380278f2d14d8276d16e1023bc5a099 100644 (file)
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -15,27 +15,28 @@
        along with this program; if not, write to the Free Software
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "control_protocol/control_protocol.h"
-#include "mackie_control_protocol.h"
 
-#include "ardour/rc_configuration.h"
+#include <stdexcept>
 
 #include "pbd/error.h"
 
-#include <stdexcept>
+#include "ardour/rc_configuration.h"
+
+#include "control_protocol/control_protocol.h"
+#include "mackie_control_protocol.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 
-ControlProtocol*
+static ControlProtocol*
 new_mackie_protocol (ControlProtocolDescriptor*, Session* s)
 {
        MackieControlProtocol* mcp = 0;
        
        try {
                mcp = new MackieControlProtocol (*s);
-               mcp->set_active (true);
+               /* do not set active here - wait for set_state() */
        }
        catch (exception & e) {
                error << "Error instantiating MackieControlProtocol: " << e.what() << endmsg;
@@ -46,7 +47,7 @@ new_mackie_protocol (ControlProtocolDescriptor*, Session* s)
        return mcp;
 }
 
-void
+static void
 delete_mackie_protocol (ControlProtocolDescriptor*, ControlProtocol* cp)
 {
        try
@@ -65,34 +66,28 @@ delete_mackie_protocol (ControlProtocolDescriptor*, ControlProtocol* cp)
        So anything that can be changed in the UI should not be used here to
        prevent loading of the lib.
 */
-bool
+static bool
 probe_mackie_protocol (ControlProtocolDescriptor*)
 {
        return MackieControlProtocol::probe();
 }
 
+// Field names commented out by JE - 06-01-2010
 static ControlProtocolDescriptor mackie_descriptor = {
-       name : "Mackie",
-       id : "uri://ardour.org/surfaces/mackie:0",
-       ptr : 0,
-       module : 0,
-       mandatory : 0,
+       /*name :              */   "Mackie",
+       /*id :                */   "uri://ardour.org/surfaces/mackie:0",
+       /*ptr :               */   0,
+       /*module :            */   0,
+       /*mandatory :         */   0,
        // actually, the surface does support feedback, but all this
        // flag does is show a submenu on the UI, which is useless for the mackie
        // because feedback is always on. In any case, who'd want to use the
        // mcu without the motorised sliders doing their thing?
-       supports_feedback : false,
-       probe : probe_mackie_protocol,
-       initialize : new_mackie_protocol,
-       destroy : delete_mackie_protocol
+       /*supports_feedback : */   false,
+       /*probe :             */   probe_mackie_protocol,
+       /*initialize :        */   new_mackie_protocol,
+       /*destroy :           */   delete_mackie_protocol
 };
        
 
-extern "C" {
-
-ControlProtocolDescriptor* 
-protocol_descriptor () {
-       return &mackie_descriptor;
-}
-
-}
+extern "C" LIBCONTROLCP_API ControlProtocolDescriptor* protocol_descriptor () { return &mackie_descriptor; }