X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=0f99675191ef617101b35aaff0b411775d9e0201;hb=ecc74ec418e060fa163d25d08a62a6e81eece114;hp=a0edafe955e38912de638dc98f86ee3a36fb7f92;hpb=d1addc203597a892c02bd162585c6a55950ffaf5;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index a0edafe95..0f9967519 100644
--- 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 {
@@ -90,7 +95,7 @@ public:
 	void set_dcp_decode_reduction (boost::optional<int> reduction);
 	boost::optional<int> dcp_decode_reduction () const;
 	void set_outline_content (bool o);
-	void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
+	void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>>);
 	void set_eyes (Eyes e);
 	void set_pad_black (bool p);
 
@@ -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 ();
 	}
@@ -127,26 +121,26 @@ public:
 	bool outline_content () const {
 		return _outline_content;
 	}
-	boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+	boost::optional<dcpomatic::Rect<double>> outline_subtitles () const {
 		return _outline_subtitles;
 	}
 	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 (boost::shared_ptr<PlayerVideo> video);
+	void image_changed (std::shared_ptr<PlayerVideo> video);
 
 	bool pending_idle_get () const {
 		return _idle_get;
 	}
 
-	boost::signals2::signal<void (boost::shared_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) */
@@ -159,59 +153,56 @@ 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 ();
 	void ui_finished ();
+	void too_many_frames_dropped ();
 
 	dcpomatic::DCPTime uncorrected_time () const;
 	Frame average_latency () const;
 
 	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;
+	VideoView* _video_view = nullptr;
+	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;
-	unsigned int _audio_block_size;
-	bool _playing;
-	int _suspended;
-	boost::shared_ptr<Butler> _butler;
+	int _audio_channels = 0;
+	unsigned int _audio_block_size = 1024;
+	bool _playing = false;
+	int _suspended = 0;
+	std::shared_ptr<Butler> _butler;
 
 	std::list<Frame> _latency_history;
 	/** Mutex to protect _latency_history */
 	mutable boost::mutex _latency_history_mutex;
-	int _latency_history_count;
+	int _latency_history_count = 0;
 
 	boost::optional<int> _dcp_decode_reduction;
 
-	ClosedCaptionsDialog* _closed_captions_dialog;
+	ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
 
-	bool _outline_content;
-	boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
+	bool _outline_content = false;
+	boost::optional<dcpomatic::Rect<double>> _outline_subtitles;
 	/** true to pad the viewer panel with black, false to use
 	    the normal window background colour.
 	*/
-	bool _pad_black;
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	bool _background_image;
-#endif
+	bool _pad_black = false;
 
 	/** true if an get() is required next time we are idle */
-	bool _idle_get;
+	bool _idle_get = false;
 
 	boost::signals2::scoped_connection _config_changed_connection;
 };