X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_decoder.h;h=0fc598bd79d0fa39a5924452a91ce086f019c176;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=4068696eafe397620b824d3665a0f0e9e541752d;hpb=248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1;p=dcpomatic.git 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 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 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 > _reels; std::list >::iterator _reel;