ardour/livetrax
13
0
Fork 0
Code

MTC,LTC print current timecodes in warning

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13274 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2012-10-14 16:17:47 +00:00
parent f6b9572bfd
commit bdcd6dba69
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/ltc_slave.cc
View File

@ -165,7 +165,10 @@ LTC_Slave::detect_ltc_fps(int frameno, bool df)
did_reset_tc_format = true;
}
if (cur_timecode != tc_format) {
warning << _("Session and LTC framerate mismatch.") << endmsg;
warning << string_compose(_("Session framerate adjusted from %1 TO: LTC's %2."),
Timecode::timecode_format_name(cur_timecode),
Timecode::timecode_format_name(tc_format))
<< endmsg;
}
session.config.set_timecode_format (tc_format);
} else {
@ -174,7 +177,10 @@ LTC_Slave::detect_ltc_fps(int frameno, bool df)
if (a3e_timecode != cur_timecode) printed_timecode_warning = false;
if (cur_timecode != tc_format && ! printed_timecode_warning) {
warning << _("Session and LTC framerate mismatch.") << endmsg;
warning << string_compose(_("Session and LTC framerate mismatch: LTC:%1 Session:%2."),
Timecode::timecode_format_name(tc_format),
Timecode::timecode_format_name(cur_timecode))
<< endmsg;
printed_timecode_warning = true;
}
}

11
libs/ardour/mtc_slave.cc
View File

@ -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;