allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

MCP updates:

Browse Source 
* Add iCON Pro Audio P1-NANO device with option of P1-X extenders left or right
* Resolve Metering on P1-M/X and P1-NANO
* Resolve SMPTE/beats display on P1-M/X and P1-NANO
This commit is contained in:
Nicolas Koch
2025-11-27 21:27:14 -05:00
committed by Paul Davis
parent 4db08ba34f
commit 3e2c73258c
8 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/surfaces/mackie/device_info.cc
View File

@@ -366,6 +366,12 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
_is_platformMp = false;
}
if ((child = node.child ("IsP1Nano")) != 0) {
child->get_property ("value", _is_p1nano);
} else {
_is_p1nano = false;
}
if ((child = node.child ("IsProG2")) != 0) {
child->get_property ("value", _is_proG2);
} else {
@@ -543,6 +549,11 @@ bool DeviceInfo::is_platformMp () const
return _is_platformMp;
}
bool DeviceInfo::is_p1nano () const
{
return _is_p1nano;
}
bool DeviceInfo::is_proG2 () const
{
return _is_proG2;

2
libs/surfaces/mackie/device_info.h
View File

@@ -82,6 +82,7 @@ class DeviceInfo
bool is_qcon() const;
bool is_v1m() const;
bool is_platformMp() const;
bool is_p1nano() const;
bool is_proG2() const;
bool is_xtouch() const;
bool has_qcon_second_lcd() const;
@@ -119,6 +120,7 @@ class DeviceInfo
bool _is_qcon;
bool _is_v1m;
bool _is_platformMp;
bool _is_p1nano;
bool _is_proG2;
bool _is_xtouch;
bool _has_qcon_second_lcd;

20
share/mcp/p1_nano+p1-x.device Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<MackieProtocolDevice>
<Name value="iCON P1-NANO with P1-X on right"/>
<Strips value="8"/>
<Extenders value="1"/>
<MasterPosition value="1"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="yes"/>
<TwoCharacterDisplay value="no"/>
<HasSeparateMeters value="yes"/>
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/>
<NoHandShake value="yes"/>
<IsP1Nano value="yes"/>
<HasQConSecondLCD value="yes"/>
<HasQConMasterMeters value="yes"/>
</MackieProtocolDevice>

20
share/mcp/p1_nano.device Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<MackieProtocolDevice>
<Name value="iCON P1-NANO"/>
<Strips value="8"/>
<Extenders value="0"/>
<MasterPosition value="0"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="yes"/>
<TwoCharacterDisplay value="no"/>
<HasSeparateMeters value="yes"/>
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/>
<NoHandShake value="yes"/>
<IsP1Nano value="yes"/>
<HasQConSecondLCD value="yes"/>
<HasQConMasterMeters value="yes"/>
</MackieProtocolDevice>

20
share/mcp/p1_x+p1_nano.device Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<MackieProtocolDevice>
<Name value="iCON P1-NANO with P1-X on left"/>
<Strips value="8"/>
<Extenders value="1"/>
<MasterPosition value="2"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="yes"/>
<TwoCharacterDisplay value="no"/>
<HasSeparateMeters value="yes"/>
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/>
<NoHandShake value="yes"/>
<IsP1Nano value="yes"/>
<HasQConSecondLCD value="yes"/>
<HasQConMasterMeters value="yes"/>
</MackieProtocolDevice>

12
share/mcp/platform_m+.device
View File

@@ -2,15 +2,19 @@
<MackieProtocolDevice>
<Name value="iCON Platform M+"/>
<Strips value="8"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="no"/>
<TwoCharacterDisplay value="no"/>
<Extenders value="0"/>
<MasterPosition value="0"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="yes"/>
<TwoCharacterDisplay value="no"/>
<HasSeparateMeters value="yes"/>
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/>
<NoHandShake value="yes"/>
<HasMeters value="no"/>
<IsPlatformMp value="yes"/>
<HasQConSecondLCD value="yes"/>
<HasQConMasterMeters value="yes"/>
</MackieProtocolDevice>

10
share/mcp/platform_m+_platformx+.device
View File

@@ -5,14 +5,16 @@
<Extenders value="1"/>
<MasterPosition value="1"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="no"/>
<TimecodeDisplay value="yes"/>
<TwoCharacterDisplay value="no"/>
<Extenders value="0"/>
<MasterPosition value="0"/>
<HasSeparateMeters value="yes"/>
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/>
<NoHandShake value="yes"/>
<HasMeters value="no"/>
<IsPlatformMp value="yes"/>
<HasQConSecondLCD value="yes"/>
<HasQConMasterMeters value="yes"/>
</MackieProtocolDevice>

10
share/mcp/platform_x+_platform_m+.device
View File

@@ -5,14 +5,16 @@
<Extenders value="1"/>
<MasterPosition value="2"/>
<MasterFader value="yes"/>
<TimecodeDisplay value="no"/>
<TimecodeDisplay value="yes"/>
<TwoCharacterDisplay value="no"/>
<Extenders value="0"/>
<MasterPosition value="0"/>
<HasSeparateMeters value="yes"/>
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/>
<NoHandShake value="yes"/>
<HasMeters value="no"/>
<IsPlatformMp value="yes"/>
<HasQConSecondLCD value="yes"/>
<HasQConMasterMeters value="yes"/>
</MackieProtocolDevice>