Include subscribers / supporters in git.

[dcpomatic.git] / src / wx / film_viewer.h

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0f99675191ef617101b35aaff0b411775d9e0201..5e5bb791660c0ebfe4d295adf03cfb0c1508908b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -62,7 +62,7 @@ public:
                return _video_view->get();
        }
 
-       VideoView const * video_view () const {
+       std::shared_ptr<const VideoView> video_view () const {
                return _video_view;
        }
 
@@ -98,6 +98,7 @@ public:
        void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>>);
        void set_eyes (Eyes e);
        void set_pad_black (bool p);
+       void set_optimise_for_j2k (bool o);
 
        void slow_refresh ();
 
@@ -115,9 +116,6 @@ public:
        }
 
        /* Some accessors and utility methods that VideoView classes need */
-       dcp::Size out_size () const {
-               return _out_size;
-       }
        bool outline_content () const {
                return _outline_content;
        }
@@ -145,6 +143,8 @@ public:
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
        boost::signals2::signal<void ()> Finished;
+       /** Emitted from the GUI thread when a lot of frames are being dropped */
+       boost::signals2::signal<void()> TooManyDropped;
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
@@ -161,7 +161,6 @@ private:
        void config_changed (Config::Property);
        void film_length_change ();
        void ui_finished ();
-       void too_many_frames_dropped ();
 
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
@@ -171,13 +170,10 @@ private:
        std::shared_ptr<Film> _film;
        std::shared_ptr<Player> _player;
 
-       VideoView* _video_view = nullptr;
+       std::shared_ptr<VideoView> _video_view;
        bool _coalesce_player_changes = false;
        std::vector<int> _pending_player_changes;
 
-       /** Size of our output (including padding if we have any) */
-       dcp::Size _out_size;
-
        RtAudio _audio;
        int _audio_channels = 0;
        unsigned int _audio_block_size = 1024;
@@ -192,6 +188,11 @@ private:
 
        boost::optional<int> _dcp_decode_reduction;
 
+       /** true to assume that this viewer is only being used for JPEG2000 sources
+        *  so it can optimise accordingly.
+        */
+       bool _optimise_for_j2k = false;
+
        ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
 
        bool _outline_content = false;