X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=29985a5816bb701b44ec3e0a5c0e92672b8a4d8c;hp=e42c37a8d4ffab33c7f06aacf165bea4aa44351d;hb=6ea0becd89bb223f26196aa9db13371990f5a1a8;hpb=86a866d5f3f5bf2fec67d1c813524479c6727eab

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index e42c37a8d..29985a581 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -87,21 +87,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 {
@@ -110,53 +114,44 @@ 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;
 	}
+	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;
 
 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);
@@ -166,13 +161,11 @@ private:
 	void recreate_butler ();
 	void config_changed (Config::Property);
 	void film_length_change ();
+	void ui_finished ();
 
-	dcpomatic::DCPTime time () const;
-	boost::optional<dcpomatic::DCPTime> audio_time () const;
 	dcpomatic::DCPTime uncorrected_time () const;
 	Frame average_latency () const;
 
-	void refresh_view ();
 	bool quick_refresh ();
 
 	boost::shared_ptr<Film> _film;
@@ -182,9 +175,6 @@ private:
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	Position<int> _inter_position;
-	dcp::Size _inter_size;
-
 	/** Size of our output (including padding if we have any) */
 	dcp::Size _out_size;
 
@@ -200,13 +190,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.
 	*/
@@ -216,9 +205,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;