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

Merge branch 'ovenwerks-master'

Browse source
This commit is contained in:
Paul Davis 2015-08-09 22:28:00 -04:00
commit 3a2a286f3a
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/mackie/device_info.cc
View file

@ -246,6 +246,8 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
if ((prop = child->property ("value")) != 0) {
if ((_master_position = atoi (prop->value().c_str())) == 0) {
_master_position = 0;
} else if (_master_position > 0) {
_master_position --;
}
}
}

3
libs/surfaces/mackie/surface.cc
View file

@ -97,7 +97,7 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui
/* lets use master_position instead */
uint32_t mp = _mcp.device_info().master_position();
if (_number == mp) {
DEBUG_TRACE (DEBUG::MackieControl, "Surface is first. Might have global controls.\n");
DEBUG_TRACE (DEBUG::MackieControl, "Surface matches MasterPosition. Might have global controls.\n");
if (_mcp.device_info().has_global_controls()) {
init_controls ();
DEBUG_TRACE (DEBUG::MackieControl, "init_controls done\n");
@ -508,6 +508,7 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev
_jog_wheel->jog_event (delta);
return;
}
// add external (pedal?) control here
return;
}