diff options
| author | Robin Gareus <robin@gareus.org> | 2012-10-16 20:53:10 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2012-10-16 20:53:10 +0000 |
| commit | 64b0efdf9f523bfb265325d139a4fbfa95a8ecde (patch) | |
| tree | 6fe4dd0bc39eb182fc1990f3b5e6003e7d8f02a1 /libs/ardour/mtc_slave.cc | |
| parent | 625ee55df0d84e708ce269ee47cc1e36881cd71e (diff) | |
MTC Slave: allow >2 sec for re-sync, format delta
git-svn-id: svn://localhost/ardour2/branches/3.0@13289 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/mtc_slave.cc')
| -rw-r--r-- | libs/ardour/mtc_slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 4b2f8e99cb..9b81acf67c 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -621,7 +621,8 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos) * also see note in MTC_Slave::init_engine_dll */ if (!session.actively_recording() - && ( (pos < 0) || (labs(pos - sess_pos) > 4 * resolution()) ) + && speed != 0 + && ( (pos < 0) || (labs(pos - sess_pos) > 3 * session.frame_rate()) ) ) { engine_dll_initstate = 0; queue_reset (false); @@ -666,7 +667,7 @@ MTC_Slave::approximate_current_delta() const snprintf(delta, sizeof(delta), "---"); } else { // TODO if current_delta > 1 frame -> display timecode. - snprintf(delta, sizeof(delta), "%+" PRIi64 " sm", current_delta); + snprintf(delta, sizeof(delta), "%+4" PRIi64 " sm", current_delta); } return std::string(delta); } |