diff --git a/app/common/timecodefunctions.cpp b/app/common/timecodefunctions.cpp index 86c9eaf36..31bab1682 100644 --- a/app/common/timecodefunctions.cpp +++ b/app/common/timecodefunctions.cpp @@ -34,7 +34,7 @@ QString Timecode::timestamp_to_timecode(const int64_t ×tamp, bool show_plus_if_positive) { if (timebase.isNull()) { - return QString(); + return QStringLiteral("INVALID TIMEBASE"); } double timestamp_dbl = (rational(timestamp) * timebase).toDouble(); @@ -126,7 +126,7 @@ QString Timecode::timestamp_to_timecode(const int64_t ×tamp, return QString::number(qRound(timestamp_dbl * 1000)); } - return QString(); + return QStringLiteral("INVALID TIMECODE MODE"); } int64_t Timecode::timecode_to_timestamp(const QString &timecode, const rational &timebase, const Display &display, bool* ok) @@ -244,6 +244,11 @@ rational Timecode::timestamp_to_time(const int64_t ×tamp, const rational &t return rational(timestamp) * timebase; } +QString Timecode::time_to_timecode(const rational &time, const rational &timebase, const Timecode::Display &display, bool show_plus_if_positive) +{ + return timestamp_to_timecode(time_to_timestamp(time, timebase), timebase, display, show_plus_if_positive); +} + bool Timecode::TimebaseIsDropFrame(const rational &timebase) { return (timebase.numerator() == 1001); diff --git a/app/common/timecodefunctions.h b/app/common/timecodefunctions.h index 0d1748394..509576e07 100644 --- a/app/common/timecodefunctions.h +++ b/app/common/timecodefunctions.h @@ -59,6 +59,8 @@ public: static rational timestamp_to_time(const int64_t& timestamp, const rational& timebase); + static QString time_to_timecode(const rational& time, const rational& timebase, const Display &display, bool show_plus_if_positive = false); + static bool TimebaseIsDropFrame(const rational& timebase); };