diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-28 23:45:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | a78b741c43830c84bcb4d18e3147746f13a668e5 (patch) | |
| tree | 170fdc1a80f397ccb6c2e9454a7a106448358dda /src/lib/player.h | |
| parent | 3d90ce7a500a33b6147c30b65766efcbc447f5ab (diff) | |
Attempt to tidy up internal APIs slightly.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 95db8756b..05e994d0b 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -75,9 +75,9 @@ public: */ boost::signals2::signal<void (bool)> Changed; - boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> Video; + boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video; boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio; - boost::signals2::signal<void (PlayerSubtitles)> Subtitle; + boost::signals2::signal<void (PlayerSubtitles, DCPTimePeriod)> Subtitle; private: friend class PlayerWrapper; @@ -99,7 +99,7 @@ private: DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) 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; + boost::shared_ptr<PlayerVideo> black_player_video_frame () const; std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid); void video (boost::weak_ptr<Piece>, ContentVideo); void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); @@ -136,7 +136,7 @@ private: AudioMerger _audio_merger; DCPTime _last_audio_time; - std::list<PlayerSubtitles> _subtitles; + std::list<std::pair<PlayerSubtitles, DCPTimePeriod> > _subtitles; boost::shared_ptr<AudioProcessor> _audio_processor; |