diff --git a/src/Lib/AbstractMediaContext.hh b/src/Lib/AbstractMediaContext.hh index 089b4db2da8b72b5b3c397079ddf6f757787add8..a73f92efdc5c6f699c99db9d3df7b4edc5620079 100644 --- a/src/Lib/AbstractMediaContext.hh +++ b/src/Lib/AbstractMediaContext.hh @@ -101,9 +101,9 @@ public: qreal getDuration() const noexcept { - TODO(Use std::chrono here) - // The whole file duration, not individual streams. - return static_cast<qreal>(dataFormat->duration) / 1000000; + return qreal(std::chrono::duration<qreal, std::ratio<1, 1>>( + std::chrono::microseconds(dataFormat->duration)) + .count()); } protected: @@ -192,11 +192,12 @@ public: return StreamWeakPtr{ spareNullSreamPtr }; } - qreal getLength() const noexcept + qreal getDuration() const noexcept { - TODO(Use std::chrono here) // The whole file duration, not individual streams. - return static_cast<qreal>(format->duration) / 1000000; + return qreal(std::chrono::duration<qreal, std::ratio<1, 1>>( + std::chrono::microseconds(format->duration)) + .count()); } StreamWeakPtr getDefaultStream() const noexcept diff --git a/src/UI/DocumentViews/TimingAxis.hh b/src/UI/DocumentViews/TimingAxis.hh index 0ed6ea2e98ebb8205aea0436bdd0f474a7065825..70bebf92d2ee6d7a5b4bb4e5ea2fed9c051b095d 100644 --- a/src/UI/DocumentViews/TimingAxis.hh +++ b/src/UI/DocumentViews/TimingAxis.hh @@ -14,7 +14,7 @@ namespace Vivy class TimingAxis final : public QGraphicsItem { public: explicit TimingAxis(qreal soundLength, int x0, int x1, int y) noexcept; - ~TimingAxis() noexcept = default; + ~TimingAxis() noexcept override = default; QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; @@ -23,13 +23,13 @@ private: static inline constexpr QColor axisColour = QColor(0, 0, 127); QVector<qreal> availableTicks = { 0.01, 0.1, 1, 10, 60, 3600, 86400 }; - qreal minBetweenMinor = 5; + qreal minBetweenMinor{ 5 }; - qreal penWidth = { 1 }; - qreal soundLength = { 0 }; - int x0 = { 0 }; - int x1 = { 0 }; - int y = { 0 }; + qreal penWidth{ 1 }; + qreal soundLength{ 0 }; + int x0{ 0 }; + int x1{ 0 }; + int y{ 0 }; protected: };