diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-08 23:41:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-10 23:43:55 +0100 |
| commit | c4403784febdbdd42e9c32e67fadb147f11fe566 (patch) | |
| tree | a3c76832e341eedcaed2152c2ebf4dd76325b6b2 /src/lib/dcpomatic_time.h | |
| parent | 248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff) | |
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/dcpomatic_time.h')
| -rw-r--r-- | src/lib/dcpomatic_time.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h index a09dd93e9..897b725bd 100644 --- a/src/lib/dcpomatic_time.h +++ b/src/lib/dcpomatic_time.h @@ -35,8 +35,13 @@ #include <iomanip> #include <cstdio> +struct dcpomatic_time_ceil_test; +struct dcpomatic_time_floor_test; + +namespace dcpomatic { + /** A time in seconds, expressed as a number scaled up by Time::HZ. We want two different - * versions of this class, ContentTime and DCPTime, and we want it to be impossible to + * versions of this class, dcpomatic::ContentTime and dcpomatic::DCPTime, and we want it to be impossible to * convert implicitly between the two. Hence there's this template hack. I'm not * sure if it's the best way to do it. * @@ -228,8 +233,8 @@ public: static const int HZ = 96000; private: - friend struct dcpomatic_time_ceil_test; - friend struct dcpomatic_time_floor_test; + friend struct ::dcpomatic_time_ceil_test; + friend struct ::dcpomatic_time_floor_test; Type _t; }; @@ -357,4 +362,6 @@ std::string to_string (ContentTime t); std::string to_string (DCPTime t); std::string to_string (DCPTimePeriod p); +} + #endif |