X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=3fc30cf9dab3b9c897cb99844c645058a5e55eef;hb=996490159c49a5a5a74be02c76fd5855cd441e49;hp=6609811e4339f804288feda8b68ed8068329dcda;hpb=22b13599407e45d85d1c83e0805aa14965b0ab19;p=dcpomatic.git diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 6609811e4..3fc30cf9d 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -51,18 +51,22 @@ public: friend struct ffmpeg_pts_offset_test; friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length); - boost::optional position () const { + ContentTime position () const { return _position; } + void seek (); + void emit (boost::shared_ptr, Frame frame); + /** @return true if the emitted data was accepted, false if not */ boost::signals2::signal Data; private: + /** Time of last thing to be emitted */ boost::shared_ptr _content; boost::optional _last_emitted; - boost::optional _position; + ContentTime _position; }; #endif