X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=d0041bd957e6394d62acdc1b79f995a7b43006a9;hp=8b45048a7b5d2e1e5aac7054d0a1380c4a2ed701;hb=d6d5e36cbeb285c78c33d88a09882d964f83d563;hpb=6349c88c4fb9d4ac76ef14b277d455e3a2b006a6

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 8b45048a7..d0041bd95 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,9 +22,11 @@
  *  @brief FilmViewer class.
  */
 
+#include "video_view.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/player_text.h"
+#include "lib/timer.h"
 #include <RtAudio.h>
 #include <wx/wx.h>
 
@@ -46,9 +48,13 @@ public:
 	FilmViewer (wxWindow *);
 	~FilmViewer ();
 
-	/** @return the panel showing the film's video */
-	wxPanel* panel () const {
-		return _panel;
+	/** @return the window showing the film's video */
+	wxWindow* panel () const {
+		return _video_view->get();
+	}
+
+	VideoView const * video_view () const {
+		return _video_view;
 	}
 
 	void show_closed_captions ();
@@ -58,17 +64,19 @@ public:
 		return _film;
 	}
 
-	void seek (DCPTime t, bool accurate);
-	void seek (boost::shared_ptr<Content> content, ContentTime p, bool accurate);
-	void seek_by (DCPTime by, bool accurate);
+	void seek (dcpomatic::DCPTime t, bool accurate);
+	void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+	void seek_by (dcpomatic::DCPTime by, bool accurate);
 	/** @return our `playhead' position; this may not lie exactly on a frame boundary */
-	DCPTime position () const {
+	dcpomatic::DCPTime position () const {
 		return _video_position;
 	}
-	DCPTime one_video_frame () const;
+	dcpomatic::DCPTime one_video_frame () const;
 
 	void start ();
 	bool stop ();
+	void suspend ();
+	void resume ();
 	bool playing () const {
 		return _playing;
 	}
@@ -88,58 +96,98 @@ public:
 
 	int audio_callback (void* out, unsigned int frames);
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	void set_background_image (bool b) {
+		_background_image = b;
+		refresh_view ();
+	}
+
+	bool background_image () const {
+		return _background_image;
+	}
+#endif
+
+	StateTimer const & state_timer () const {
+		return _state_timer;
+	}
+
+	StateTimer& state_timer () {
+		return _state_timer;
+	}
+
+	int gets () const {
+		return _gets;
+	}
+
+	/* Some accessors 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;
+	}
+	bool pad_black () const {
+		return _pad_black;
+	}
+
 	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
 	boost::signals2::signal<void ()> PositionChanged;
-	boost::signals2::signal<void (DCPTime)> Started;
-	boost::signals2::signal<void (DCPTime)> Stopped;
-	boost::signals2::signal<void (DCPTime)> Seeked;
+	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;
 
 	boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
-	void paint_panel ();
-	void panel_sized (wxSizeEvent &);
-	void timer ();
+
+	/* XXX_b: to remove */
+	friend class SimpleVideoView;
+
+	void video_view_sized ();
 	void calculate_sizes ();
 	void player_change (ChangeType type, int, bool);
-	void get ();
+	bool get (bool lazy);
+	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);
-	bool maybe_draw_background_image (wxPaintDC& dc);
 
-	DCPTime time () const;
-	DCPTime uncorrected_time () const;
+	dcpomatic::DCPTime time () const;
+	dcpomatic::DCPTime uncorrected_time () const;
 	Frame average_latency () const;
 
-	void refresh_panel ();
+	void refresh_view ();
 	bool quick_refresh ();
 
 	boost::shared_ptr<Film> _film;
 	boost::shared_ptr<Player> _player;
 
-	/** The area that we put our image in */
-	wxPanel* _panel;
-	wxTimer _timer;
+	VideoView* _video_view;
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
-	boost::shared_ptr<const Image> _frame;
-	DCPTime _video_position;
+	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+	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;
-	/** Size of the panel that we have available */
-	dcp::Size _panel_size;
 
 	RtAudio _audio;
 	int _audio_channels;
 	unsigned int _audio_block_size;
 	bool _playing;
+	int _suspended;
 	boost::shared_ptr<Butler> _butler;
 
 	std::list<Frame> _latency_history;
@@ -160,10 +208,14 @@ private:
 	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;
 };