X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=29985a5816bb701b44ec3e0a5c0e92672b8a4d8c;hb=357d55e1561c7c3b3fc31e645ad445c7e9398a7d;hp=76917f8078122d3bfe46b4dc9255e86c7d3a15f1;hpb=6743eacf57a1209270f4021684425865bb72b00f;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 76917f807..29985a581 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -27,6 +27,7 @@
 #include "lib/config.h"
 #include "lib/player_text.h"
 #include "lib/timer.h"
+#include "lib/signaller.h"
 #include <RtAudio.h>
 #include <wx/wx.h>
 
@@ -42,7 +43,7 @@ class ClosedCaptionsDialog;
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */
-class FilmViewer
+class FilmViewer : public Signaller
 {
 public:
 	FilmViewer (wxWindow *);
@@ -53,6 +54,10 @@ public:
 		return _video_view->get();
 	}
 
+	VideoView const * video_view () const {
+		return _video_view;
+	}
+
 	void show_closed_captions ();
 
 	void set_film (boost::shared_ptr<Film>);
@@ -65,12 +70,15 @@ 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;
 
 	void start ();
 	bool stop ();
+	void suspend ();
+	void resume ();
+
 	bool playing () const {
 		return _playing;
 	}
@@ -79,51 +87,62 @@ 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_panel ();
+		_video_view->update ();
 	}
-#endif
 
-	StateTimer const & state_timer () const {
-		return _state_timer;
+	bool background_image () const {
+		return _background_image;
 	}
+#endif
 
-	int gets () const {
-		return _gets;
+	StateTimer const & state_timer () const {
+		return _video_view->state_timer ();
 	}
 
-	/* Some accessors that VideoView classes need */
+	/* 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 ()> 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) */
@@ -132,38 +151,30 @@ public:
 	boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
+
 	void video_view_sized ();
-	void timer ();
 	void calculate_sizes ();
 	void player_change (ChangeType type, int, bool);
-	void get ();
-	void display_player_video ();
+	void idle_handler ();
+	void request_idle_display_next_frame ();
 	void film_change (ChangeType, Film::Property);
 	void recreate_butler ();
 	void config_changed (Config::Property);
-	bool maybe_draw_background_image (wxPaintDC& dc);
+	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;
 	boost::shared_ptr<Player> _player;
 
 	VideoView* _video_view;
-	wxTimer _timer;
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
-	boost::shared_ptr<const Image> _frame;
-	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;
 
@@ -171,6 +182,7 @@ private:
 	int _audio_channels;
 	unsigned int _audio_block_size;
 	bool _playing;
+	int _suspended;
 	boost::shared_ptr<Butler> _butler;
 
 	std::list<Frame> _latency_history;
@@ -178,27 +190,23 @@ 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.
 	*/
 	bool _pad_black;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-	bool _in_watermark;
-	int _watermark_x;
-	int _watermark_y;
 	bool _background_image;
 #endif
 
-	StateTimer _state_timer;
-	int _gets;
+	/** true if an get() is required next time we are idle */
+	bool _idle_get;
 
 	boost::signals2::scoped_connection _config_changed_connection;
 };