ardour/livetrax
13
0
Fork 0
Code

adds support for iCon QCon ProG2 controller

Browse Source 
This commit does no remapping, but it adds the Pro G2 as a value in the
device profiles.
This commit is contained in:
Caleb Potter 2022-03-04 14:18:57 -06:00 committed by Paul Davis
parent 1a2d229d7b
commit 381276e862
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ DeviceInfo::DeviceInfo()
, _no_handshake (false) , _no_handshake (false)
, _is_qcon(false) , _is_qcon(false)
, _is_platformMp(false) , _is_platformMp(false)
, _is_proG2(false)
, _has_qcon_second_lcd(false) , _has_qcon_second_lcd(false)
, _has_qcon_master_meters(false) , _has_qcon_master_meters(false)
, _has_meters (true) , _has_meters (true)
@ -346,6 +347,12 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
_is_platformMp = false; _is_platformMp = false;
} }
if ((child = node.child ("IsProG2")) != 0) {
child->get_property ("value", _is_proG2);
} else {
_is_proG2 = false;
}
if ((child = node.child ("HasQConSecondLCD")) != 0) { if ((child = node.child ("HasQConSecondLCD")) != 0) {
child->get_property ("value", _has_qcon_second_lcd); child->get_property ("value", _has_qcon_second_lcd);
} else { } else {
@ -511,6 +518,11 @@ bool DeviceInfo::is_platformMp () const
return _is_platformMp; return _is_platformMp;
} }
bool DeviceInfo::is_proG2 () const
{
return _is_proG2;
}
bool bool
DeviceInfo::has_qcon_second_lcd () const DeviceInfo::has_qcon_second_lcd () const
{ {

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

@ -82,6 +82,7 @@ class DeviceInfo
bool no_handshake() const; bool no_handshake() const;
bool is_qcon() const; bool is_qcon() const;
bool is_platformMp() const; bool is_platformMp() const;
bool is_proG2() const;
bool has_qcon_second_lcd() const; bool has_qcon_second_lcd() const;
bool has_qcon_master_meters() const; bool has_qcon_master_meters() const;
bool has_meters() const; bool has_meters() const;
@ -116,6 +117,7 @@ class DeviceInfo
bool _no_handshake; bool _no_handshake;
bool _is_qcon; bool _is_qcon;
bool _is_platformMp; bool _is_platformMp;
bool _is_proG2;
bool _has_qcon_second_lcd; bool _has_qcon_second_lcd;
bool _has_qcon_master_meters; bool _has_qcon_master_meters;
bool _has_meters; bool _has_meters;

1
share/mcp/qcon_g2+g2ex.device
View File

@ -14,5 +14,6 @@
<LogicControlButtons value="yes"/> <LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/> <usesIPMIDI value="no"/>
<NoHandShake value="yes"/> <NoHandShake value="yes"/>
<IsProG2 value="yes"/>
<IsQCon value="yes"/> <IsQCon value="yes"/>
</MackieProtocolDevice> </MackieProtocolDevice>

1
share/mcp/qcon_g2.device
View File

@ -14,5 +14,6 @@
<LogicControlButtons value="yes"/> <LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/> <usesIPMIDI value="no"/>
<NoHandShake value="yes"/> <NoHandShake value="yes"/>
<IsProG2 value="yes"/>
<IsQCon value="yes"/> <IsQCon value="yes"/>
</MackieProtocolDevice> </MackieProtocolDevice>

1
share/mcp/qcon_g2ex+g2.device
View File

@ -14,5 +14,6 @@
<LogicControlButtons value="yes"/> <LogicControlButtons value="yes"/>
<usesIPMIDI value="no"/> <usesIPMIDI value="no"/>
<NoHandShake value="yes"/> <NoHandShake value="yes"/>
<IsProG2 value="yes"/>
<IsQCon value="yes"/> <IsQCon value="yes"/>
</MackieProtocolDevice> </MackieProtocolDevice>