Turn off the feedback flag, cos feedback is always on. And hopefully better shutdown...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2142 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index eda485b5d65a4a90b395f63df3d088fa29141872..461f5171ac2dd3e4124ddd634e2930bd31333a8c 100644 (file)
--- 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,7 @@ static ControlProtocolDescriptor mackie_descriptor = {
        ptr : 0,
        module : 0,
        mandatory : 0,
-       supports_feedback : true,
+       supports_feedback : false,
        probe : probe_mackie_protocol,
        initialize : new_mackie_protocol,
        destroy : delete_mackie_protocol