Attempt to tidy up internal APIs slightly.

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index d0d68c064a3eaf4198c785ae8b12e1dc667c37b6..05e994d0bb105aa8b797762e96a285e3de4e4624 100644 (file)
--- 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;
@@ -93,14 +93,13 @@ private:
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int, bool);
        std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
-       void update_subtitle_from_text ();
        Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        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;
-       boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) 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 () 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);
@@ -132,9 +131,12 @@ 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;
+
+       std::list<std::pair<PlayerSubtitles, DCPTimePeriod> > _subtitles;
 
        boost::shared_ptr<AudioProcessor> _audio_processor;