"merge" (i.e. wholesale import) 2.0-ongoing Mackie code and then fix to compile in 3.0 context

git-svn-id: svn://localhost/ardour2/branches/3.0@4315 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 19 insertions, 2 deletions

diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index eda485b5d6..7872d47a78 100644
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -64,9 +64,22 @@ new_mackie_protocol (ControlProtocolDescriptor* descriptor, Session* s)
 void
 delete_mackie_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
 {
-	delete cp;
+	try
+	{
+		delete cp;
+	}
+	catch ( exception & e )
+	{
+		cout << "Exception caught trying to destroy MackieControlProtocol: " << e.what() << endl;
+	}
 }
 
+/**
+	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.
+*/
 bool
 probe_mackie_protocol (ControlProtocolDescriptor* descriptor)
 {
@@ -79,7 +92,11 @@ static ControlProtocolDescriptor mackie_descriptor = {
 	ptr : 0,
 	module : 0,
 	mandatory : 0,
-	supports_feedback : true,
+	// 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