projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.h
diff --git
a/src/lib/dcp_decoder.h
b/src/lib/dcp_decoder.h
index 4068696eafe397620b824d3665a0f0e9e541752d..0fc598bd79d0fa39a5924452a91ce086f019c176 100644
(file)
--- 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 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 ();
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 (
void pass_texts (
- ContentTime next,
+
dcpomatic::
ContentTime next,
boost::shared_ptr<dcp::SubtitleAsset> asset,
bool reference,
int64_t entry_point,
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 */
);
/** 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;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;