Change video content scaling so that it either:

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

diff --git a/src/lib/player.h b/src/lib/player.h
index c2911bf1087e19dae86257c37c14ce9c1a864b21..bb2a0c613e3760c5cce9fdb6642d7abb535e94c2 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -60,6 +60,7 @@ public:
        static int const FILM_CONTAINER;
        static int const FILM_VIDEO_FRAME_RATE;
        static int const DCP_DECODE_REDUCTION;
+       static int const PLAYBACK_LENGTH;
 };
 
 /** @class Player
@@ -68,6 +69,7 @@ public:
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
+       Player (boost::shared_ptr<const Film>);
        Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist);
        ~Player ();
 
@@ -113,6 +115,7 @@ private:
        friend struct empty_test2;
        friend struct check_reuse_old_data_test;
 
+       void construct ();
        void setup_pieces ();
        void setup_pieces_unlocked ();
        void flush ();
@@ -140,6 +143,7 @@ private:
        void emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
        void do_emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
        void emit_audio (boost::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time);
+       boost::shared_ptr<const Playlist> playlist () const;
 
        /** Mutex to protect the whole Player state.  When it's used for the preview we have
            seek() and pass() called from the Butler thread and lots of other stuff called
@@ -148,13 +152,16 @@ private:
        mutable boost::mutex _mutex;
 
        boost::shared_ptr<const Film> _film;
+       /** Playlist, or 0 if we are using the one from the _film */
        boost::shared_ptr<const Playlist> _playlist;
 
        /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
        boost::atomic<int> _suspended;
        std::list<boost::shared_ptr<Piece> > _pieces;
 
-       /** Size of the image in the DCP (e.g. 1990x1080 for flat) */
+       /** Size of the image we are rendering to; this may be the DCP frame size, or
+        *  the size of preview in a window.
+        */
        dcp::Size _video_container_size;
        boost::shared_ptr<Image> _black_image;
 
@@ -207,8 +214,7 @@ private:
        ActiveText _active_texts[TEXT_COUNT];
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
-       /* Cached stuff */
-       boost::optional<dcpomatic::DCPTime> _film_length;
+       dcpomatic::DCPTime _playback_length;
 
        boost::signals2::scoped_connection _film_changed_connection;
        boost::signals2::scoped_connection _playlist_change_connection;