diff options
author | Robin Gareus <robin@gareus.org> | 2012-10-14 16:17:47 +0000 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2012-10-14 16:17:47 +0000 |
commit | bdcd6dba699d153d80091322b1997284eff9bc02 (patch) | |
tree | c05284892777fdeb7ab09fc59781ba227ad775ed /libs/ardour/mtc_slave.cc | |
parent | f6b9572bfd86537422b7cb033e83ae1651f30816 (diff) |
MTC,LTC print current timecodes in warning
git-svn-id: svn://localhost/ardour2/branches/3.0@13274 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/mtc_slave.cc')
-rw-r--r-- | libs/ardour/mtc_slave.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index e08c14890c..4696f1e936 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -344,7 +344,10 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now) did_reset_tc_format = true; } if (cur_timecode != tc_format) { - warning << _("Session and MTC framerate mismatch.") << endmsg; + warning << string_compose(_("Session framerate adjusted from %1 TO: MTC's %2."), + Timecode::timecode_format_name(cur_timecode), + Timecode::timecode_format_name(tc_format)) + << endmsg; } session.config.set_timecode_format (tc_format); } else { @@ -353,7 +356,10 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now) if (a3e_timecode != cur_timecode) printed_timecode_warning = false; if (cur_timecode != tc_format && ! printed_timecode_warning) { - warning << _("Session and MTC framerate mismatch.") << endmsg; + warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 Ardour:%2."), + Timecode::timecode_format_name(tc_format), + Timecode::timecode_format_name(cur_timecode)) + << endmsg; printed_timecode_warning = true; } } @@ -538,6 +544,7 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos) { framepos_t now = session.engine().frame_time_at_cycle_start(); framepos_t sess_pos = session.transport_frame(); // corresponds to now + //sess_pos -= session.engine().frames_since_cycle_start(); SafeTime last; framecnt_t elapsed; |