diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-26 17:52:51 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | b29571d1fbf3bcd9f5cbd9c20f1d5f8211876e94 (patch) | |
| tree | 4ef4c05977b846b18d9959c0c410da3da47d1078 /src/lib/player.h | |
| parent | 8b0cdac1ce437a46815b04ff3261febd1269a71c (diff) | |
Various bits; preview video seems to work.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index d0d68c064..80fc9fb70 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -98,8 +98,8 @@ private: DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const; Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const; DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const; - ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const; - DCPTime content_subtitle_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const; + ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const; + DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const; boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const; std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid); void video (boost::weak_ptr<Piece>, ContentVideo); @@ -132,9 +132,10 @@ private: bool _play_referenced; boost::shared_ptr<PlayerVideo> _last_video; - DCPTime _last_video_time; + boost::optional<DCPTime> _last_video_time; AudioMerger _audio_merger; + DCPTime _last_audio_time; boost::shared_ptr<AudioProcessor> _audio_processor; |