Move some updates from content_change to player_change.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 909bf0ac70b262f881e3694ba13e66049d2d12ab..125e4fd2d958787585be3ffe667e91063a1fa0a9 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.
  */
@@ -151,7 +156,6 @@ private:
        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 ();
@@ -167,7 +171,7 @@ private:
 
        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;