ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NO-OP: whitespac

Browse Source
This commit is contained in:
Robin Gareus 2019-03-23 17:35:26 +01:00
parent 60686a7b37
commit 3448f3151e
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View File

@ -1232,11 +1232,11 @@ GenericMidiControlProtocol::create_function (const XMLNode& node)
ev = MIDI::program;
} else if ((prop = node.property (X_("sysex"))) != 0 || (prop = node.property (X_("msg"))) != 0) {
if (prop->name() == X_("sysex")) {
ev = MIDI::sysex;
} else {
ev = MIDI::any;
}
if (prop->name() == X_("sysex")) {
ev = MIDI::sysex;
} else {
ev = MIDI::any;
}
int val;
uint32_t cnt;
@ -1332,11 +1332,11 @@ GenericMidiControlProtocol::create_action (const XMLNode& node)
ev = MIDI::program;
} else if ((prop = node.property (X_("sysex"))) != 0 || (prop = node.property (X_("msg"))) != 0) {
if (prop->name() == X_("sysex")) {
ev = MIDI::sysex;
} else {
ev = MIDI::any;
}
if (prop->name() == X_("sysex")) {
ev = MIDI::sysex;
} else {
ev = MIDI::any;
}
int val;
uint32_t cnt;

6
libs/surfaces/generic_midi/generic_midi_control_protocol.h
View File

@ -39,7 +39,7 @@ namespace ARDOUR {
}
namespace MIDI {
class Port;
class Port;
}
class MIDIControllable;
@ -144,8 +144,8 @@ private:
};
typedef std::list<MIDIPendingControllable* > MIDIPendingControllables;
MIDIPendingControllables pending_controllables;
Glib::Threads::Mutex controllables_lock;
Glib::Threads::Mutex pending_lock;
Glib::Threads::Mutex controllables_lock;
Glib::Threads::Mutex pending_lock;
bool start_learning (boost::weak_ptr<PBD::Controllable>);
void stop_learning (boost::weak_ptr<PBD::Controllable>);

2
libs/surfaces/generic_midi/midicontrollable.cc
View File

@ -725,7 +725,7 @@ MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool /*forc
return buf;
}
DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("Feedback: %1 %2\n", control_description(), current_uri()));
DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("Feedback: %1 %2\n", control_description(), current_uri()));
*buf++ = (0xF0 & control_type) | (0xF & control_channel);
int ev_size = 3;