X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=e9450c7e7166a7c92926099fc60577a2e0fcec66;hb=9911159cb0bd9817265fe66086f75612f077aaf8;hp=97da5f59185e8c1b030b0abb2e683c866e8c4ced;hpb=b7e546d9685c0a3304faa48e95516915d811ec5c;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 97da5f591..e9450c7e7 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -22,6 +22,7 @@
  *  @brief FilmViewer class.
  */
 
+#include "video_view.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/player_text.h"
@@ -47,9 +48,9 @@ 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();
 	}
 
 	void show_closed_captions ();
@@ -59,14 +60,14 @@ 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 ();
@@ -92,7 +93,11 @@ public:
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	void set_background_image (bool b) {
 		_background_image = b;
-		refresh_panel ();
+		refresh_view ();
+	}
+
+	bool background_image () const {
+		return _background_image;
 	}
 #endif
 
@@ -100,22 +105,45 @@ public:
 		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;
+	}
+	dcpomatic::DCPTime video_position () const {
+		return _video_position;
+	}
+
 	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 (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 video_view_sized ();
 	void timer ();
 	void calculate_sizes ();
 	void player_change (ChangeType type, int, bool);
@@ -124,34 +152,29 @@ private:
 	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;
+	VideoView* _video_view;
 	wxTimer _timer;
 	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;
@@ -177,9 +200,6 @@ private:
 	bool _pad_black;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-	bool _in_watermark;
-	int _watermark_x;
-	int _watermark_y;
 	bool _background_image;
 #endif