ardour/livetrax
13
0
Fork 0
Code

Mackie Control: Clean up detection of QCon master display and meter.

Browse Source 
Only enable the master display and meter modes for Qcon devices if this
surface is in the master position. Extenders don't have master meters
or master displays.
This commit is contained in:
Todd Naugle 2021-12-13 21:26:45 -06:00
parent d60a5187bd
commit d04d25e7c7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/surfaces/mackie/surface.cc
View File

@ -127,19 +127,19 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui
} }
//Store Qcon flag //Store Qcon flag
if( mcp.device_info().is_qcon() ) { is_qcon = mcp.device_info().is_qcon();
is_qcon = true;
_has_master_display = (mcp.device_info().has_master_fader() && mcp.device_info().has_qcon_second_lcd());
_has_master_meter = mcp.device_info().has_qcon_master_meters();
} else {
is_qcon = false;
}
/* only the first Surface object has global controls */ /* only the first Surface object has global controls */
/* lets use master_position instead */ /* lets use master_position instead */
uint32_t mp = _mcp.device_info().master_position(); uint32_t mp = _mcp.device_info().master_position();
if (_number == mp) { if (_number == mp) {
DEBUG_TRACE (DEBUG::MackieControl, "Surface matches MasterPosition. Might have global controls.\n"); DEBUG_TRACE (DEBUG::MackieControl, "Surface matches MasterPosition. Might have global controls.\n");
if ( is_qcon ) {
_has_master_display = (mcp.device_info().has_master_fader() && mcp.device_info().has_qcon_second_lcd());
_has_master_meter = mcp.device_info().has_qcon_master_meters();
}
if (_mcp.device_info().has_global_controls()) { if (_mcp.device_info().has_global_controls()) {
init_controls (); init_controls ();
DEBUG_TRACE (DEBUG::MackieControl, "init_controls done\n"); DEBUG_TRACE (DEBUG::MackieControl, "init_controls done\n");