summaryrefslogtreecommitdiff
path: root/src/lib/dcp_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-08 23:41:42 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-10 23:43:55 +0100
commitc4403784febdbdd42e9c32e67fadb147f11fe566 (patch)
treea3c76832e341eedcaed2152c2ebf4dd76325b6b2 /src/lib/dcp_decoder.h
parent248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff)
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/dcp_decoder.h')
-rw-r--r--src/lib/dcp_decoder.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 4068696ea..0fc598bd7 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -50,16 +50,16 @@ public:
void set_forced_reduction (boost::optional<int> reduction);
bool pass ();
- void seek (ContentTime t, bool accurate);
+ void seek (dcpomatic::ContentTime t, bool accurate);
private:
friend struct dcp_subtitle_within_dcp_test;
void next_reel ();
void get_readers ();
- void pass_texts (ContentTime next, dcp::Size size);
+ void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
void pass_texts (
- ContentTime next,
+ dcpomatic::ContentTime next,
boost::shared_ptr<dcp::SubtitleAsset> asset,
bool reference,
int64_t entry_point,
@@ -68,7 +68,7 @@ private:
);
/** Time of next thing to return from pass relative to the start of _reel */
- ContentTime _next;
+ dcpomatic::ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;