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 cb3403c3d5ae4c9cabe90f865d38bbe3032e5fe5..05e994d0bb105aa8b797762e96a285e3de4e4624 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -26,6 +26,11 @@
 #include "content.h"
 #include "position_image.h"
 #include "piece.h"
+#include "content_video.h"
+#include "content_audio.h"
+#include "content_subtitle.h"
+#include "audio_stream.h"
+#include "audio_merger.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
@@ -48,9 +53,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> playlist);
 
-       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, bool burnt, bool accurate);
+       bool pass ();
+       void seek (DCPTime time, bool accurate);
+
        std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
        std::list<ReferencedReelAsset> get_reel_assets ();
 
@@ -70,6 +75,10 @@ public:
         */
        boost::signals2::signal<void (bool)> Changed;
 
+       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, DCPTimePeriod)> Subtitle;
+
 private:
        friend class PlayerWrapper;
        friend class Piece;
@@ -79,20 +88,23 @@ private:
        friend struct player_time_calculation_test3;
 
        void setup_pieces ();
-       void reset_pieces ();
        void flush ();
        void film_changed (Film::Property);
        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;
-       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;
+       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 () 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);
+       void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
+       void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -118,6 +130,14 @@ private:
        /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
        bool _play_referenced;
 
+       boost::shared_ptr<PlayerVideo> _last_video;
+       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;
 
        boost::signals2::scoped_connection _film_changed_connection;