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

Mackie Control, fix timecode sometimes won't update. Do full display if transport moves faster than 800%.

Browse source
This commit is contained in:
Len Ovens 2015-12-11 12:57:24 -08:00
parent 14ef6017f6
commit 0103de801a
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -106,6 +106,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
: ControlProtocol (session, X_("Mackie")) : ControlProtocol (session, X_("Mackie"))
, AbstractUI<MackieControlUIRequest> ("mackie") , AbstractUI<MackieControlUIRequest> ("mackie")
, _current_initial_bank (0) , _current_initial_bank (0)
, _frame_last (0)
, _timecode_type (ARDOUR::AnyTime::BBT) , _timecode_type (ARDOUR::AnyTime::BBT)
, _gui (0) , _gui (0)
, _scrub_mode (false) , _scrub_mode (false)
@ -1143,6 +1144,13 @@ MackieControlProtocol::update_timecode_display()
// do assignment here so current_frame is fixed // do assignment here so current_frame is fixed
framepos_t current_frame = session->transport_frame(); framepos_t current_frame = session->transport_frame();
string timecode; string timecode;
// For large jumps in play head possition do full reset
int moved = (current_frame - _frame_last) / session->frame_rate ();
if (moved) {
DEBUG_TRACE (DEBUG::MackieControl, "Timecode reset\n");
_timecode_last = string (10, ' ');
}
_frame_last = current_frame;
switch (_timecode_type) { switch (_timecode_type) {
case ARDOUR::AnyTime::BBT: case ARDOUR::AnyTime::BBT:

1
libs/surfaces/mackie/mackie_control_protocol.h
View file

@ -308,6 +308,7 @@ class MackieControlProtocol
Mackie::Timer _frm_left_last; Mackie::Timer _frm_left_last;
// last written timecode string // last written timecode string
std::string _timecode_last; std::string _timecode_last;
framepos_t _frame_last;
// Which timecode are we displaying? BBT or Timecode // Which timecode are we displaying? BBT or Timecode
ARDOUR::AnyTime::Type _timecode_type; ARDOUR::AnyTime::Type _timecode_type;
// Bundle to represent our input ports // Bundle to represent our input ports