No-op: remove all trailing whitespace.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 7fbeebc8c2f4432c85bd101fc3c2bea18ae0fc12..f22faa7ac28bf9d3f84fb829d61be72ee3dbb41d 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,10 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include "playlist.h"
 #include "content.h"
 #include "film.h"
 #include "rect.h"
@@ -34,10 +30,12 @@
 #include "piece.h"
 #include "content_video.h"
 #include "player_subtitles.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Job;
 class Film;
-class Playlist;
 class AudioContent;
 class Piece;
 class Image;
@@ -45,7 +43,8 @@ class Decoder;
 class Resampler;
 class PlayerVideo;
 class ImageProxy;
- 
+class Font;
+
 class PlayerStatistics
 {
 public:
@@ -56,7 +55,7 @@ public:
                        , good (0)
                        , skip (0)
                {}
-               
+
                int black;
                int repeat;
                int good;
@@ -69,7 +68,7 @@ public:
                        , good (0)
                        , skip (0)
                {}
-               
+
                DCPTime silence;
                int64_t good;
                int64_t skip;
@@ -79,22 +78,25 @@ public:
 };
 
 /** @class Player
- *  @brief A class which can `play' a Playlist.
+ *  @brief A class which can `play' a Film.
  */
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-       Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+       Player (boost::shared_ptr<const Film>);
 
        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);
+       std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
 
        void set_video_container_size (dcp::Size);
-       void set_approximate_size ();
+       void set_ignore_video ();
+       void set_enable_subtitles (bool enable);
+       void set_burn_subtitles (bool burn);
 
        PlayerStatistics const & statistics () const;
-       
+
        /** Emitted when something has changed such that if we went back and emitted
         *  the last frame again it would look different.  This is not emitted after
         *  a seek.
@@ -106,18 +108,17 @@ public:
 private:
        friend class PlayerWrapper;
        friend class Piece;
-       friend class player_overlaps_test;
+       friend struct player_overlaps_test;
 
        void setup_pieces ();
-       void playlist_changed ();
        void content_changed (boost::weak_ptr<Content>, int, bool);
        void flush ();
        void film_changed (Film::Property);
        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;
+       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_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<PlayerVideo> black_player_video_frame (DCPTime) const;
 
@@ -140,27 +141,30 @@ private:
                                overlaps.push_back (*i);
                        }
                }
-               
+
                return overlaps;
        }
-       
+
        boost::shared_ptr<const Film> _film;
-       boost::shared_ptr<const Playlist> _playlist;
 
        /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
        bool _have_valid_pieces;
        std::list<boost::shared_ptr<Piece> > _pieces;
 
+       /** Size of the image in the DCP (e.g. 1990x1080 for flat) */
        dcp::Size _video_container_size;
        boost::shared_ptr<Image> _black_image;
 
-       bool _approximate_size;
+       /** true if the player should ignore all video; i.e. never produce any */
+       bool _ignore_video;
+       /** true if the player should burn subtitles into the video */
        bool _burn_subtitles;
 
+       boost::shared_ptr<AudioProcessor> _audio_processor;
+
        PlayerStatistics _statistics;
 
-       boost::signals2::scoped_connection _playlist_changed_connection;
-       boost::signals2::scoped_connection _playlist_content_changed_connection;
+       boost::signals2::scoped_connection _film_content_changed_connection;
        boost::signals2::scoped_connection _film_changed_connection;
 };