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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 077d8a6a5..6b6aa78f5 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -119,7 +119,7 @@ public:
 		return _gets;
 	}
 
-	/* Some accessors that VideoView classes need */
+	/* Some accessors and utility methods that VideoView classes need */
 	dcp::Size out_size () const {
 		return _out_size;
 	}
@@ -135,9 +135,12 @@ public:
 	bool pad_black () const {
 		return _pad_black;
 	}
+	boost::shared_ptr<Butler> butler () const {
+		return _butler;
+	}
+	int time_until_next_frame () const;
 
 	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
-	boost::signals2::signal<void ()> PositionChanged;
 	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) */
@@ -149,13 +152,14 @@ 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 display_player_video ();
 	void film_change (ChangeType, Film::Property);
 	void recreate_butler ();
 	void config_changed (Config::Property);
@@ -174,7 +178,6 @@ private:
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
 	dcpomatic::DCPTime _video_position;
 	Position<int> _inter_position;
 	dcp::Size _inter_size;