Merge master.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 6805dc8c7f08be630073fd640f5bcacb38277407..7fbeebc8c2f4432c85bd101fc3c2bea18ae0fc12 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -33,6 +33,7 @@
 #include "position_image.h"
 #include "piece.h"
 #include "content_video.h"
+#include "player_subtitles.h"
 
 class Job;
 class Film;
@@ -42,7 +43,7 @@ class Piece;
 class Image;
 class Decoder;
 class Resampler;
-class PlayerVideoFrame;
+class PlayerVideo;
 class ImageProxy;
  
 class PlayerStatistics
@@ -85,8 +86,9 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc
 public:
        Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
 
-       std::list<boost::shared_ptr<PlayerVideoFrame> > get_video (DCPTime time, bool accurate);
+       std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
        boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
+       PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting);
 
        void set_video_container_size (dcp::Size);
        void set_approximate_size ();
@@ -111,15 +113,13 @@ private:
        void content_changed (boost::weak_ptr<Content>, int, bool);
        void flush ();
        void film_changed (Film::Property);
-       std::list<PositionImage> process_content_image_subtitles (
-               boost::shared_ptr<SubtitleContent>, std::list<boost::shared_ptr<ContentImageSubtitle> >
-               ) const;
-       std::list<PositionImage> process_content_text_subtitles (std::list<boost::shared_ptr<ContentTextSubtitle> >) const;
+       std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
        void update_subtitle_from_text ();
        VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+       DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) const;
        AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       boost::shared_ptr<PlayerVideoFrame> black_player_video_frame () const;
+       boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
 
        /** @return Pieces of content type C that overlap a specified time range in the DCP */
        template<class C>