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

iCon device tweaks: faster timecode display refresh rate. Submitted by Michal Barhon.

This commit is contained in:
Ben Loftis 2018-02-10 18:07:05 -06:00
parent dddfa1ddd8
commit b1d7eabf54
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -459,13 +459,25 @@ MackieControlProtocol::set_active (bool yn)
/* set up periodic task for timecode display and metering and automation
*/
Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (100); // milliseconds
// set different refresh time for qcon and standard mackie MCU
int iTimeCodeRefreshTime = 100; // default value for mackie MCU (100ms)
int iStripDisplayRefreshTime = 10; // default value for Mackie MCU (10ms)
if(_device_info.is_qcon()){
// set faster timecode display refresh speed (55ms)
iTimeCodeRefreshTime = 55;
// set slower refresh time on qcon than on mackie (15ms)
iStripDisplayRefreshTime = 15;
}
Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (iTimeCodeRefreshTime); // milliseconds
periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::periodic));
periodic_timeout->attach (main_loop()->get_context());
/* periodic task used to update strip displays */
Glib::RefPtr<Glib::TimeoutSource> redisplay_timeout = Glib::TimeoutSource::create (10); // milliseconds
Glib::RefPtr<Glib::TimeoutSource> redisplay_timeout = Glib::TimeoutSource::create (iStripDisplayRefreshTime); // milliseconds
redisplay_connection = redisplay_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::redisplay));
redisplay_timeout->attach (main_loop()->get_context());
@ -1382,8 +1394,21 @@ MackieControlProtocol::notify_record_state_changed ()
ls = on;
break;
case Session::Enabled:
DEBUG_TRACE (DEBUG::MackieControl, "record state changed to enabled, LED flashing\n");
ls = flashing;
if(_device_info.is_qcon()){
// For qcon the rec button is two state only (on/off)
DEBUG_TRACE (DEBUG::MackieControl, "record state changed to enabled, LED on (QCon)\n");
ls = on;
break;
}
else{
// For standard Mackie MCU the record LED is flashing
DEBUG_TRACE (DEBUG::MackieControl, "record state changed to enabled, LED flashing\n");
ls = flashing;
break;
}
break;
}

2
mcp/qcon+qex.device
View File

@ -1,5 +1,5 @@
<MackieProtocolDevice>
<Name value="iCON QCon + One QCon Expander on Right"/>
<Name value="iCON QCon Pro and QCon Expander on Right"/>
<Strips value="8"/>
<Extenders value="1"/>
<MasterPosition value="1"/>

2
mcp/qcon.device
View File

@ -1,5 +1,5 @@
<MackieProtocolDevice>
<Name value="iCON Qcon"/>
<Name value="iCON QCon Pro"/>
<Strips value="8"/>
<Extenders value="0"/>
<MasterPosition value="0"/>