diff options
| author | John Anderson <ardour@semiosix.com> | 2007-07-18 16:57:38 +0000 |
|---|---|---|
| committer | John Anderson <ardour@semiosix.com> | 2007-07-18 16:57:38 +0000 |
| commit | 814160a6d54332a582f1d0d6bf10b62877f246c0 (patch) | |
| tree | ad41293a5a732416509fd3a5a90dfb0d01bccb64 | |
| parent | f2a9371d28231ef756a8a54550beda01cbd69c08 (diff) | |
Turn off the feedback flag, cos feedback is always on. And hopefully better shutdown handling.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2142 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/surfaces/mackie/interface.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc index eda485b5d6..461f5171ac 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,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 |