X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=c467eedc1645d806495ea0d01cf1ddbd59cfed6b;hb=4f4561c4b5bb1e8a2fa8e673606d18ffa25aec6c;hp=125e4fd2d958787585be3ffe667e91063a1fa0a9;hpb=abe21002bc84db630d860bc304261497cfd71f9b;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 125e4fd2d..c467eedc1 100644
--- 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;
 	}
 
@@ -95,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);
 
@@ -115,13 +115,10 @@ 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;
 	}
-	boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+	boost::optional<dcpomatic::Rect<double>> outline_subtitles () const {
 		return _outline_subtitles;
 	}
 	bool pad_black () const {
@@ -145,6 +142,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;
 
@@ -153,6 +152,7 @@ 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);
@@ -169,38 +169,35 @@ private:
 	std::shared_ptr<Film> _film;
 	std::shared_ptr<Player> _player;
 
-	VideoView* _video_view;
-	bool _coalesce_player_changes;
+	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;
-	unsigned int _audio_block_size;
-	bool _playing;
-	int _suspended;
+	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;
+	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;
 };