Typo fix.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 11a4731fca82648c1fbf5a47593d1572d51bd526..8024bb1bfc16ff9020b5596e057c1dbd0b9fb3df 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file  src/film_viewer.h
  *  @brief FilmViewer class.
  */
 
+
 #include "video_view.h"
 #include "lib/film.h"
 #include "lib/config.h"
@@ -33,6 +35,8 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
+#include <vector>
+
 
 class wxToggleButton;
 class FFmpegPlayer;
@@ -43,6 +47,7 @@ class Player;
 class Butler;
 class ClosedCaptionsDialog;
 
+
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */
@@ -63,13 +68,13 @@ public:
 
        void show_closed_captions ();
 
-       void set_film (boost::shared_ptr<Film>);
-       boost::shared_ptr<Film> film () const {
+       void set_film (std::shared_ptr<Film>);
+       std::shared_ptr<Film> film () const {
                return _film;
        }
 
        void seek (dcpomatic::DCPTime t, bool accurate);
-       void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+       void seek (std::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
        void seek_by (dcpomatic::DCPTime by, bool accurate);
        /** @return our `playhead' position; this may not lie exactly on a frame boundary */
        dcpomatic::DCPTime position () const {
@@ -105,17 +110,6 @@ public:
 
        int audio_callback (void* out, unsigned int frames);
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       void set_background_image (bool b) {
-               _background_image = b;
-               _video_view->update ();
-       }
-
-       bool background_image () const {
-               return _background_image;
-       }
-#endif
-
        StateTimer const & state_timer () const {
                return _video_view->state_timer ();
        }
@@ -133,19 +127,20 @@ public:
        bool pad_black () const {
                return _pad_black;
        }
-       boost::shared_ptr<Butler> butler () const {
+       std::shared_ptr<Butler> butler () const {
                return _butler;
        }
        ClosedCaptionsDialog* closed_captions_dialog () const {
                return _closed_captions_dialog;
        }
        void finished ();
+       void image_changed (std::shared_ptr<PlayerVideo> video);
 
        bool pending_idle_get () const {
                return _idle_get;
        }
 
-       boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+       boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
@@ -158,10 +153,10 @@ private:
        void video_view_sized ();
        void calculate_sizes ();
        void player_change (ChangeType type, int, bool);
+       void player_change (std::vector<int> properties);
        void idle_handler ();
        void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);
-       void content_change (ChangeType, int property);
        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();
@@ -172,12 +167,12 @@ private:
 
        bool quick_refresh ();
 
-       boost::shared_ptr<Film> _film;
-       boost::shared_ptr<Player> _player;
+       std::shared_ptr<Film> _film;
+       std::shared_ptr<Player> _player;
 
        VideoView* _video_view;
        bool _coalesce_player_changes;
-       std::list<int> _pending_player_changes;
+       std::vector<int> _pending_player_changes;
 
        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
@@ -187,7 +182,7 @@ private:
        unsigned int _audio_block_size;
        bool _playing;
        int _suspended;
-       boost::shared_ptr<Butler> _butler;
+       std::shared_ptr<Butler> _butler;
 
        std::list<Frame> _latency_history;
        /** Mutex to protect _latency_history */
@@ -205,10 +200,6 @@ private:
        */
        bool _pad_black;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _background_image;
-#endif
-
        /** true if an get() is required next time we are idle */
        bool _idle_get;