X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=c54ff6eb44e78301689445ca4e4629afc4c76661;hb=0802245c4c89b9a8557e5f9b238e8317a92ba51d;hp=5c2f7cb11b174860be1e6ec767aa1bd45928011e;hpb=79355249a27ead72bc2bcd0a84e7a280a3d9a826;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5c2f7cb11..c54ff6eb4 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -92,14 +92,19 @@ public:
 
 	void slow_refresh ();
 
+	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,24 +113,13 @@ 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;
-	}
 	bool outline_content () const {
 		return _outline_content;
 	}
@@ -135,23 +129,21 @@ public:
 	boost::shared_ptr<Butler> butler () const {
 		return _butler;
 	}
+	ClosedCaptionsDialog* closed_captions_dialog () const {
+		return _closed_captions_dialog;
+	}
+	void finished ();
 
 	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);
@@ -161,13 +153,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;
@@ -177,8 +167,6 @@ private:
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	dcp::Size _inter_size;
-
 	/** Size of our output (including padding if we have any) */
 	dcp::Size _out_size;
 
@@ -199,7 +187,6 @@ private:
 	ClosedCaptionsDialog* _closed_captions_dialog;
 
 	bool _outline_content;
-	Eyes _eyes;
 	/** true to pad the viewer panel with black, false to use
 	    the normal window background colour.
 	*/
@@ -209,9 +196,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;