Comment format tweak.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index cb3403c3d5ae4c9cabe90f865d38bbe3032e5fe5..20d9c9388b33fa00464aa06609a836514220571e 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -22,10 +22,16 @@
 #define DCPOMATIC_PLAYER_H
 
 #include "player_subtitles.h"
+#include "active_subtitles.h"
 #include "film.h"
 #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,16 +54,14 @@ 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 ();
 
        void set_video_container_size (dcp::Size);
        void set_ignore_video ();
-       void set_ignore_audio ();
-       void set_enable_subtitles (bool enable);
        void set_always_burn_subtitles (bool burn);
        void set_fast ();
        void set_play_referenced ();
@@ -70,29 +74,47 @@ 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;
+       /** Emitted when a subtitle is ready.  This signal may be emitted considerably
+        *  after the corresponding Video.
+        */
+       boost::signals2::signal<void (PlayerSubtitles, DCPTimePeriod)> Subtitle;
+
 private:
        friend class PlayerWrapper;
        friend class Piece;
-       friend struct player_overlaps_test;
        friend struct player_time_calculation_test1;
        friend struct player_time_calculation_test2;
        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;
-       std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid);
+       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;
+       void video (boost::weak_ptr<Piece>, ContentVideo);
+       void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
+       void image_subtitle_start (boost::weak_ptr<Piece>, ContentImageSubtitle);
+       void text_subtitle_start (boost::weak_ptr<Piece>, ContentTextSubtitle);
+       void subtitle_stop (boost::weak_ptr<Piece>, ContentTime);
+       DCPTime one_video_frame () const;
+       void fill_audio (DCPTimePeriod period);
+       void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time);
+       std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
+               boost::shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to
+               ) const;
+       boost::optional<PositionImage> subtitles_for_frame (DCPTime time) const;
+       void emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
+       void emit_audio (boost::shared_ptr<AudioBuffers> data, DCPTime time);
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -118,6 +140,35 @@ private:
        /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
        bool _play_referenced;
 
+       /** Time just after the last video frame we emitted, or the time of the last accurate seek */
+       boost::optional<DCPTime> _last_video_time;
+       /** Time just after the last audio frame we emitted, or the time of the last accurate seek */
+       boost::optional<DCPTime> _last_audio_time;
+
+       typedef std::map<boost::weak_ptr<Piece>, boost::shared_ptr<PlayerVideo> > LastVideoMap;
+       LastVideoMap _last_video;
+
+       AudioMerger _audio_merger;
+
+       class StreamState
+       {
+       public:
+               StreamState () {}
+
+               StreamState (boost::shared_ptr<Piece> p, DCPTime l)
+                       : piece(p)
+                       , last_push_end(l)
+               {}
+
+               boost::shared_ptr<Piece> piece;
+               DCPTime last_push_end;
+       };
+       std::map<AudioStreamPtr, StreamState> _stream_states;
+
+       std::list<DCPTimePeriod> _no_video;
+       std::list<DCPTimePeriod> _no_audio;
+
+       ActiveSubtitles _active_subtitles;
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
        boost::signals2::scoped_connection _film_changed_connection;