Remove some more unnecessary use of shared_ptr.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index ef5ce41c925d2e535204c9c0d9fd441f02791829..062522ffd54bb2fa24d48b582212e57c8670b22d 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -25,27 +25,27 @@
 
 
 #include "video_view.h"
-#include "lib/film.h"
 #include "lib/config.h"
+#include "lib/film.h"
 #include "lib/player_text.h"
-#include "lib/timer.h"
 #include "lib/signaller.h"
-#include "lib/warnings.h"
+#include "lib/timer.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <RtAudio.h>
-DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 
-class wxToggleButton;
+class Butler;
+class ClosedCaptionsDialog;
 class FFmpegPlayer;
 class Image;
-class RGBPlusAlphaImage;
-class PlayerVideo;
 class Player;
-class Butler;
-class ClosedCaptionsDialog;
+class PlayerVideo;
+class RGBPlusAlphaImage;
+class wxToggleButton;
 
 
 /** @class FilmViewer
@@ -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;
        }
 
@@ -80,6 +80,7 @@ public:
        dcpomatic::DCPTime position () const {
                return _video_view->position();
        }
+       boost::optional<dcpomatic::ContentTime> position_in_content (std::shared_ptr<const Content> content) const;
        dcpomatic::DCPTime one_video_frame () const;
 
        void start ();
@@ -98,6 +99,9 @@ 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 set_crop_guess (dcpomatic::Rect<float> crop);
+       void unset_crop_guess ();
 
        void slow_refresh ();
 
@@ -132,14 +136,17 @@ public:
        }
        void finished ();
        void image_changed (std::shared_ptr<PlayerVideo> video);
+       boost::optional<dcpomatic::Rect<float>> crop_guess () const {
+               return _crop_guess;
+       }
 
        bool pending_idle_get () const {
                return _idle_get;
        }
 
        boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
-       boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
-       boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
+       boost::signals2::signal<void ()> Started;
+       boost::signals2::signal<void ()> 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 */
@@ -160,6 +167,7 @@ private:
        void config_changed (Config::Property);
        void film_length_change ();
        void ui_finished ();
+       void start_audio_stream_if_open ();
 
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
@@ -167,9 +175,9 @@ private:
        bool quick_refresh ();
 
        std::shared_ptr<Film> _film;
-       std::shared_ptr<Player> _player;
+       boost::optional<Player> _player;
 
-       VideoView* _video_view = nullptr;
+       std::shared_ptr<VideoView> _video_view;
        bool _coalesce_player_changes = false;
        std::vector<int> _pending_player_changes;
 
@@ -187,6 +195,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;
@@ -199,5 +212,7 @@ private:
        /** true if an get() is required next time we are idle */
        bool _idle_get = false;
 
+       boost::optional<dcpomatic::Rect<float>> _crop_guess;
+
        boost::signals2::scoped_connection _config_changed_connection;
 };