diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-01 18:14:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-06 21:31:09 +0100 |
| commit | 4532b2ae1a0fce6e2a8bc6e9f9922a99a3efb493 (patch) | |
| tree | e879ed62791605b315f3ebf550016465c3a151de /src/lib/ffmpeg_content.h | |
| parent | 86f2d59536e17257bc85ad60c08ede18ab7d701c (diff) | |
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 4c612cd3e..8871301b1 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -63,8 +63,8 @@ public: std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *, bool with_paths) const; - DCPTime full_length (boost::shared_ptr<const Film> film) const; - DCPTime approximate_length () const; + dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const; + dcpomatic::DCPTime approximate_length () const; std::string identifier () const; @@ -91,7 +91,7 @@ public: void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>); - boost::optional<ContentTime> first_video () const { + boost::optional<dcpomatic::ContentTime> first_video () const { boost::mutex::scoped_lock lm (_mutex); return _first_video; } @@ -116,7 +116,7 @@ private: std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams; boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream; - boost::optional<ContentTime> _first_video; + boost::optional<dcpomatic::ContentTime> _first_video; /** Video filters that should be used when generating DCPs */ std::vector<Filter const *> _filters; |