X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Finterface.cc;h=3b0477066083f8efa3b037f4836f2084419b7dd3;hb=d0746b8378689268c0fc09e7c9155282ae6c7c38;hp=eda485b5d65a4a90b395f63df3d088fa29141872;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index eda485b5d6..3b04770660 100644
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -15,82 +15,87 @@
 	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 <pbd/error.h>
 
 #include <stdexcept>
 
+#include "pbd/error.h"
+
+#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;
+using namespace ArdourSurface;
+using namespace Mackie;
 
-ControlProtocol*
-new_mackie_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+static ControlProtocol*
+new_mackie_protocol (ControlProtocolDescriptor*, Session* s)
 {
-	if ( Config->get_mmc_port_name().substr(0,3) == "mcu" )
-	{
-		error << "mcu already used as mmc port" << endmsg;
+	MackieControlProtocol* mcp = 0;
+
+	try {
+		mcp = new MackieControlProtocol (*s);
+		/* do not set active here - wait for set_state() */
 	}
-	else if ( Config->get_mtc_port_name().substr(0,3) == "mcu" )
-	{
-		error << "mcu already used as mtc port" << endmsg;
+	catch (exception & e) {
+		error << "Error instantiating MackieControlProtocol: " << e.what() << endmsg;
+		delete mcp;
+		mcp = 0;
 	}
-	else if ( Config->get_midi_port_name().substr(0,3) == "mcu" )
+
+	return mcp;
+}
+
+static void
+delete_mackie_protocol (ControlProtocolDescriptor*, ControlProtocol* cp)
+{
+	try
 	{
-		error << "mcu already used as midi port" << endmsg;
+		delete cp;
 	}
-	else
+	catch ( exception & e )
 	{
-		// no one else is using the port, so try instantiate the object
-		MackieControlProtocol * mcp = 0;
-		try
-		{
-			mcp = new MackieControlProtocol (*s);
-			mcp->set_active( true );
-		}
-		catch( exception & e )
-		{
-			error << "Error instantiating MackieControlProtocol: " << e.what() << endmsg;
-			delete mcp;
-			mcp = 0;
-		}
-		return mcp;
+		cout << "Exception caught trying to destroy MackieControlProtocol: " << e.what() << endl;
 	}
-	return 0;
 }
 
-void
-delete_mackie_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+/**
+	This is called on startup to check whether the lib should be loaded.
+
+	So anything that can be changed in the UI should not be used here to
+	prevent loading of the lib.
+*/
+static bool
+probe_mackie_protocol (ControlProtocolDescriptor*)
 {
-	delete cp;
+	return MackieControlProtocol::probe();
 }
 
-bool
-probe_mackie_protocol (ControlProtocolDescriptor* descriptor)
+static void*
+mackie_request_buffer_factory (uint32_t num_requests)
 {
-	return MackieControlProtocol::probe();
+	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,
-	supports_feedback : true,
-	probe : probe_mackie_protocol,
-	initialize : new_mackie_protocol,
-	destroy : delete_mackie_protocol
+	/*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,
+	/*request_buffer_factory */ mackie_request_buffer_factory
 };
-	
-
-extern "C" {
 
-ControlProtocolDescriptor* 
-protocol_descriptor () {
-	return &mackie_descriptor;
-}
-
-}
+extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &mackie_descriptor; }