X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=825273373b9bde74161c63a4c537058f4fab12c8;hb=d430b8650121bfdad3d22b903521a146ad46c487;hp=5d5d3316377c2c3e03a9af08d11254086bf479bd;hpb=f77529bdfa01ae13f889442900988fc401b63c62;p=dcpomatic.git

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 5d5d33163..825273373 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -30,10 +30,13 @@
 #include <boost/thread.hpp>
 #include <boost/noncopyable.hpp>
 
-class Image;
-class wxWindow;
 class FilmViewer;
 class PlayerVideo;
+class wxWindow;
+
+namespace dcpomatic {
+	class Image;
+}
 
 class VideoView : public ExceptionStore, public boost::noncopyable
 {
@@ -41,31 +44,36 @@ public:
 	VideoView (FilmViewer* viewer);
 	virtual ~VideoView () {}
 
-	virtual void set_image (boost::shared_ptr<const Image> image) = 0;
+	/** @return the thing displaying the image */
 	virtual wxWindow* get () const = 0;
-	/** Redraw the view after something has changed like content outlining,
-	 *  the film being removed, etc.
-	 */
+	/** Re-make and display the image from the current _player_video */
 	virtual void update () = 0;
-
+	/** Called when playback starts */
 	virtual void start ();
-	/* XXX_b: make pure */
+	/** Called when playback stops */
 	virtual void stop () {}
+	/** Get the next frame and display it; used after seek */
+	virtual bool display_next_frame (bool) = 0;
 
 	void clear ();
+	bool refresh_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
 
+	/** Emitted from the GUI thread when our display changes in size */
 	boost::signals2::signal<void()> Sized;
 
-	virtual bool display_next_frame (bool) = 0;
 
-	/* XXX_b: to remove */
-	virtual void display_player_video () {}
+	/* Accessors for FilmViewer */
 
 	int dropped () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _dropped;
 	}
 
+	int errored () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _errored;
+	}
+
 	int gets () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _gets;
@@ -80,6 +88,11 @@ public:
 		return _player_video.second;
 	}
 
+
+	/* Setters for FilmViewer so it can tell us our state and
+	 * we can then use (thread) safely.
+	 */
+
 	void set_video_frame_rate (int r) {
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_frame_rate = r;
@@ -101,11 +114,8 @@ public:
 	}
 
 protected:
-	/* XXX_b: to remove */
-	friend class FilmViewer;
-
 	bool get_next_frame (bool non_blocking);
-	int time_until_next_frame () const;
+	boost::optional<int> time_until_next_frame () const;
 	dcpomatic::DCPTime one_video_frame () const;
 
 	int video_frame_rate () const {
@@ -144,7 +154,7 @@ protected:
 	StateTimer _state_timer;
 
 private:
-	/** Mutex protecting all the state in VideoView */
+	/** Mutex protecting all the state in this class */
 	mutable boost::mutex _mutex;
 
 	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
@@ -155,6 +165,7 @@ private:
 	bool _three_d;
 
 	int _dropped;
+	int _errored;
 	int _gets;
 };