diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-29 09:14:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-29 20:53:49 +0200 |
| commit | 39fb8198febde1937019db1c300ec363aab5aa56 (patch) | |
| tree | 52bc32134e8ae2b5587b3a62130baa9acf815b60 /src/lib/dcpomatic_time.cc | |
| parent | b249700e1da7dd6631a8b4440587f4093a2bdef1 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/dcpomatic_time.cc')
| -rw-r--r-- | src/lib/dcpomatic_time.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc index 8abd77555..ac797f8f4 100644 --- a/src/lib/dcpomatic_time.cc +++ b/src/lib/dcpomatic_time.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,26 +18,31 @@ */ + #include "dcpomatic_time.h" #include <inttypes.h> + using std::string; using namespace dcpomatic; + template <> Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f) - : _t (llrint (d.get() * f.speed_up)) + : _t (llrint(d.get() * f.speed_up)) { } + template <> Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f) - : _t (llrint (d.get() / f.speed_up)) + : _t (llrint(d.get() / f.speed_up)) { } + DCPTime dcpomatic::min (DCPTime a, DCPTime b) { @@ -48,6 +53,7 @@ dcpomatic::min (DCPTime a, DCPTime b) return b; } + DCPTime dcpomatic::max (DCPTime a, DCPTime b) { @@ -58,6 +64,7 @@ dcpomatic::max (DCPTime a, DCPTime b) return b; } + ContentTime dcpomatic::min (ContentTime a, ContentTime b) { @@ -68,6 +75,7 @@ dcpomatic::min (ContentTime a, ContentTime b) return b; } + ContentTime dcpomatic::max (ContentTime a, ContentTime b) { @@ -78,6 +86,7 @@ dcpomatic::max (ContentTime a, ContentTime b) return b; } + string dcpomatic::to_string (ContentTime t) { @@ -90,6 +99,7 @@ dcpomatic::to_string (ContentTime t) return buffer; } + string dcpomatic::to_string (DCPTime t) { @@ -102,6 +112,7 @@ dcpomatic::to_string (DCPTime t) return buffer; } + string dcpomatic::to_string (DCPTimePeriod p) { |