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

Allow any one midi event to control only one thing.

Browse source
This commit is contained in:
Len Ovens 2015-07-20 12:37:53 -07:00 • committed by Paul Davis
parent fee54fb155
commit 6ab04a27c3
3 changed files with 64 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,6 +299,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
} }
Glib::Threads::Mutex::Lock lm2 (controllables_lock); Glib::Threads::Mutex::Lock lm2 (controllables_lock);
DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("Learn binding: Controlable number: %1\n", c));
MIDIControllables::iterator tmp; MIDIControllables::iterator tmp;
for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ) { for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ) {
@ -350,7 +351,6 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
pending_controllables.push_back (element); pending_controllables.push_back (element);
} }
mc->learn_about_external_control (); mc->learn_about_external_control ();
return true; return true;
} }
@ -425,6 +425,7 @@ GenericMidiControlProtocol::delete_binding (PBD::Controllable* control)
} }
} }
// This next function seems unused
void void
GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos, int control_number) GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos, int control_number)
{ {
@ -462,6 +463,65 @@ GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos,
} }
} }
void
GenericMidiControlProtocol::check_used_event (int pos, int control_number)
{
Glib::Threads::Mutex::Lock lm2 (controllables_lock);
MIDI::channel_t channel = (pos & 0xf);
MIDI::byte value = control_number;
DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("checking for used event: Channel: %1 Controller: %2 value: %3\n", (int) channel, (pos & 0xf0), (int) value));
// Remove any old binding for this midi channel/type/value pair
// Note: can't use delete_binding() here because we don't know the specific controllable we want to remove, only the midi information
for (MIDIControllables::iterator iter = controllables.begin(); iter != controllables.end();) {
MIDIControllable* existingBinding = (*iter);
if ( (existingBinding->get_control_type() & 0xf0 ) == (pos & 0xf0) && (existingBinding->get_control_channel() & 0xf ) == channel ) {
if ( ((int) existingBinding->get_control_additional() == (int) value) || ((pos & 0xf0) == MIDI::pitchbend)) {
DEBUG_TRACE (DEBUG::GenericMidi, "checking: found match, delete old binding.\n");
delete existingBinding;
iter = controllables.erase (iter);
} else {
++iter;
}
} else {
++iter;
}
}
for (MIDIFunctions::iterator iter = functions.begin(); iter != functions.end();) {
MIDIFunction* existingBinding = (*iter);
if ( (existingBinding->get_control_type() & 0xf0 ) == (pos & 0xf0) && (existingBinding->get_control_channel() & 0xf ) == channel ) {
if ( ((int) existingBinding->get_control_additional() == (int) value) || ((pos & 0xf0) == MIDI::pitchbend)) {
DEBUG_TRACE (DEBUG::GenericMidi, "checking: found match, delete old binding.\n");
delete existingBinding;
iter = functions.erase (iter);
} else {
++iter;
}
} else {
++iter;
}
}
for (MIDIActions::iterator iter = actions.begin(); iter != actions.end();) {
MIDIAction* existingBinding = (*iter);
if ( (existingBinding->get_control_type() & 0xf0 ) == (pos & 0xf0) && (existingBinding->get_control_channel() & 0xf ) == channel ) {
if ( ((int) existingBinding->get_control_additional() == (int) value) || ((pos & 0xf0) == MIDI::pitchbend)) {
DEBUG_TRACE (DEBUG::GenericMidi, "checking: found match, delete old binding.\n");
delete existingBinding;
iter = actions.erase (iter);
} else {
++iter;
}
} else {
++iter;
}
}
}
XMLNode& XMLNode&
GenericMidiControlProtocol::get_state () GenericMidiControlProtocol::get_state ()
{ {
@ -550,7 +610,6 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
{ {
Glib::Threads::Mutex::Lock lm2 (controllables_lock); Glib::Threads::Mutex::Lock lm2 (controllables_lock);
controllables.clear ();
nlist = node.children(); // "Controls" nlist = node.children(); // "Controls"
if (!nlist.empty()) { if (!nlist.empty()) {

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

@ -72,6 +72,8 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
int load_bindings (const std::string&); int load_bindings (const std::string&);
void drop_bindings (); void drop_bindings ();
void check_used_event (int, int);
std::string current_binding() const { return _current_binding; } std::string current_binding() const { return _current_binding; }
struct MapInfo { struct MapInfo {

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

@ -394,6 +394,7 @@ MIDIControllable::midi_receiver (Parser &, MIDI::byte *msg, size_t /*len*/)
return; return;
} }
_surface->check_used_event(msg[0], msg[1]);
bind_midi ((channel_t) (msg[0] & 0xf), eventType (msg[0] & 0xF0), msg[1]); bind_midi ((channel_t) (msg[0] & 0xf), eventType (msg[0] & 0xF0), msg[1]);
if (controllable) { if (controllable) {