smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

fix up some issues introduced by lifecycle tracking of Controllable in Generic MIDI control code

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12947 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-26 19:10:11 +00:00
parent faaac88ac8
commit dde521f2c6
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View file

@ -638,7 +638,7 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath)
_current_bank = 0; _current_bank = 0;
} }
if ((prop = (*citer)->property ("motorised")) != 0) { if ((prop = (*citer)->property ("motorised")) != 0 || ((prop = (*citer)->property ("motorized")) != 0)) {
_motorised = string_is_affirmative (prop->value ()); _motorised = string_is_affirmative (prop->value ());
} else { } else {
_motorised = false; _motorised = false;

5
libs/surfaces/generic_midi/midicontrollable.cc
View file

@ -25,6 +25,7 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/controllable_descriptor.h" #include "pbd/controllable_descriptor.h"
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "pbd/stacktrace.h"
#include "midi++/port.h" #include "midi++/port.h"
#include "midi++/channel.h" #include "midi++/channel.h"
@ -77,7 +78,7 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, Port& p, Cont
MIDIControllable::~MIDIControllable () MIDIControllable::~MIDIControllable ()
{ {
drop_controllable (); drop_external_control ();
} }
int int
@ -112,7 +113,6 @@ MIDIControllable::drop_external_control ()
void void
MIDIControllable::set_controllable (Controllable* c) MIDIControllable::set_controllable (Controllable* c)
{ {
drop_controllable ();
controllable = c; controllable = c;
} }
@ -210,7 +210,6 @@ MIDIControllable::lookup_controllable()
void void
MIDIControllable::drop_controllable () MIDIControllable::drop_controllable ()
{ {
drop_external_control ();
controllable_death_connection.disconnect (); controllable_death_connection.disconnect ();
controllable = 0; controllable = 0;
} }