X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_viewer.h;h=6e995813c5c0215751ec2ba52f31df6701330903;hb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;hp=ec481f34e7f10d46e1fd24b518335020ada0c590;hpb=b3b371294ed5e6cc18ef64ba1b06ca76726b903a;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index ec481f34e..6e995813c 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,8 +28,11 @@
 #include "lib/player_text.h"
 #include "lib/timer.h"
 #include "lib/signaller.h"
+#include "lib/warnings.h"
 #include <RtAudio.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxToggleButton;
 class FFmpegPlayer;
@@ -87,6 +90,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_eyes (Eyes e);
 	void set_pad_black (bool p);
 
@@ -96,6 +100,7 @@ public:
 	boost::optional<dcpomatic::DCPTime> audio_time () const;
 
 	int dropped () const;
+	int errored () const;
 	int gets () const;
 
 	int audio_callback (void* out, unsigned int frames);
@@ -122,6 +127,9 @@ public:
 	bool outline_content () const {
 		return _outline_content;
 	}
+	boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+		return _outline_subtitles;
+	}
 	bool pad_black () const {
 		return _pad_black;
 	}
@@ -131,13 +139,17 @@ public:
 	ClosedCaptionsDialog* closed_captions_dialog () const {
 		return _closed_captions_dialog;
 	}
+	void finished ();
+
+	bool pending_idle_get () const {
+		return _idle_get;
+	}
 
 	boost::signals2::signal<void (boost::weak_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) */
 	boost::signals2::signal<void ()> Finished;
-	void emit_finished ();
 
 	boost::signals2::signal<bool ()> PlaybackPermitted;
 
@@ -152,6 +164,7 @@ private:
 	void recreate_butler ();
 	void config_changed (Config::Property);
 	void film_length_change ();
+	void ui_finished ();
 
 	dcpomatic::DCPTime uncorrected_time () const;
 	Frame average_latency () const;
@@ -185,6 +198,7 @@ private:
 	ClosedCaptionsDialog* _closed_captions_dialog;
 
 	bool _outline_content;
+	boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
 	/** true to pad the viewer panel with black, false to use
 	    the normal window background colour.
 	*/