Remove unused "mark" parameter from stop_touch() API

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

diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index 289f1a946dda71ffb354b5ff564bee7c1d96bd9f..3b0477066083f8efa3b037f4836f2084419b7dd3 100644 (file)
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -28,12 +28,14 @@
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 static ControlProtocol*
 new_mackie_protocol (ControlProtocolDescriptor*, Session* s)
 {
        MackieControlProtocol* mcp = 0;
-       
+
        try {
                mcp = new MackieControlProtocol (*s);
                /* do not set active here - wait for set_state() */
@@ -43,7 +45,7 @@ new_mackie_protocol (ControlProtocolDescriptor*, Session* s)
                delete mcp;
                mcp = 0;
        }
-       
+
        return mcp;
 }
 
@@ -72,21 +74,28 @@ probe_mackie_protocol (ControlProtocolDescriptor*)
        return MackieControlProtocol::probe();
 }
 
+static void*
+mackie_request_buffer_factory (uint32_t num_requests)
+{
+       return MackieControlProtocol::request_factory (num_requests);
+}
+
+// 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,
+       /*request_buffer_factory */ mackie_request_buffer_factory
 };
-       
 
 extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &mackie_descriptor; }