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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 6b6aa78f5..6e995813c 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -27,8 +27,12 @@
 #include "lib/config.h"
 #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;
@@ -42,7 +46,7 @@ class ClosedCaptionsDialog;
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */
-class FilmViewer
+class FilmViewer : public Signaller
 {
 public:
 	FilmViewer (wxWindow *);
@@ -69,7 +73,7 @@ public:
 	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 {
-		return _video_position;
+		return _video_view->position();
 	}
 	dcpomatic::DCPTime one_video_frame () const;
 
@@ -77,6 +81,7 @@ public:
 	bool stop ();
 	void suspend ();
 	void resume ();
+
 	bool playing () const {
 		return _playing;
 	}
@@ -85,21 +90,25 @@ 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);
 
 	void slow_refresh ();
 
-	int dropped () const {
-		return _dropped;
-	}
+	dcpomatic::DCPTime time () const;
+	boost::optional<dcpomatic::DCPTime> audio_time () const;
+
+	int dropped () const;
+	int errored () const;
+	int gets () const;
 
 	int audio_callback (void* out, unsigned int frames);
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	void set_background_image (bool b) {
 		_background_image = b;
-		refresh_view ();
+		_video_view->update ();
 	}
 
 	bool background_image () const {
@@ -108,37 +117,33 @@ public:
 #endif
 
 	StateTimer const & state_timer () const {
-		return _state_timer;
-	}
-
-	StateTimer& state_timer () {
-		return _state_timer;
-	}
-
-	int gets () const {
-		return _gets;
+		return _video_view->state_timer ();
 	}
 
 	/* Some accessors and utility methods that VideoView classes need */
 	dcp::Size out_size () const {
 		return _out_size;
 	}
-	dcp::Size inter_size () const {
-		return _inter_size;
-	}
-	Position<int> inter_position () const {
-		return _inter_position;
-	}
 	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;
 	}
 	boost::shared_ptr<Butler> butler () const {
 		return _butler;
 	}
-	int time_until_next_frame () const;
+	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;
@@ -150,25 +155,20 @@ public:
 
 private:
 
-	/* XXX_b: to remove */
-	friend class SimpleVideoView;
-	friend class GLVideoView;
-	friend class VideoView;
-
 	void video_view_sized ();
 	void calculate_sizes ();
 	void player_change (ChangeType type, int, bool);
 	void idle_handler ();
-	void request_idle_get ();
+	void request_idle_display_next_frame ();
 	void film_change (ChangeType, Film::Property);
 	void recreate_butler ();
 	void config_changed (Config::Property);
+	void film_length_change ();
+	void ui_finished ();
 
-	dcpomatic::DCPTime time () const;
 	dcpomatic::DCPTime uncorrected_time () const;
 	Frame average_latency () const;
 
-	void refresh_view ();
 	bool quick_refresh ();
 
 	boost::shared_ptr<Film> _film;
@@ -178,10 +178,6 @@ private:
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	dcpomatic::DCPTime _video_position;
-	Position<int> _inter_position;
-	dcp::Size _inter_size;
-
 	/** Size of our output (including padding if we have any) */
 	dcp::Size _out_size;
 
@@ -197,13 +193,12 @@ private:
 	mutable boost::mutex _latency_history_mutex;
 	int _latency_history_count;
 
-	int _dropped;
 	boost::optional<int> _dcp_decode_reduction;
 
 	ClosedCaptionsDialog* _closed_captions_dialog;
 
 	bool _outline_content;
-	Eyes _eyes;
+	boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
 	/** true to pad the viewer panel with black, false to use
 	    the normal window background colour.
 	*/
@@ -213,9 +208,6 @@ private:
 	bool _background_image;
 #endif
 
-	StateTimer _state_timer;
-	int _gets;
-
 	/** true if an get() is required next time we are idle */
 	bool _idle_get;