X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=909bf0ac70b262f881e3694ba13e66049d2d12ab;hb=8c69ddde092048f848e4614ffe269651475ba2b0;hp=5c2f7cb11b174860be1e6ec767aa1bd45928011e;hpb=79355249a27ead72bc2bcd0a84e7a280a3d9a826;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5c2f7cb11..909bf0ac7 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,8 +28,11 @@
 #include "lib/player_text.h"
 #include "lib/timer.h"
 #include "lib/signaller.h"
+#include "lib/warnings.h"
 #include <RtAudio.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxToggleButton;
 class FFmpegPlayer;
@@ -60,13 +63,13 @@ public:
 
 	void show_closed_captions ();
 
-	void set_film (boost::shared_ptr<Film>);
-	boost::shared_ptr<Film> film () const {
+	void set_film (std::shared_ptr<Film>);
+	std::shared_ptr<Film> film () const {
 		return _film;
 	}
 
 	void seek (dcpomatic::DCPTime t, bool accurate);
-	void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+	void seek (std::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 */
 	dcpomatic::DCPTime position () const {
@@ -87,98 +90,85 @@ 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 ();
 
+	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_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;
+		return _video_view->state_timer ();
 	}
 
 	/* 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;
-	}
 	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 {
+	std::shared_ptr<Butler> butler () const {
 		return _butler;
 	}
+	ClosedCaptionsDialog* closed_captions_dialog () const {
+		return _closed_captions_dialog;
+	}
+	void finished ();
+	void image_changed (std::shared_ptr<PlayerVideo> video);
 
-	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+	bool pending_idle_get () const {
+		return _idle_get;
+	}
+
+	boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
 	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;
-	void emit_finished ();
 
 	boost::signals2::signal<bool ()> PlaybackPermitted;
 
 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_display_next_frame ();
 	void film_change (ChangeType, Film::Property);
+	void content_change (ChangeType, int property);
 	void recreate_butler ();
 	void config_changed (Config::Property);
 	void film_length_change ();
+	void ui_finished ();
 
-	dcpomatic::DCPTime time () const;
-	boost::optional<dcpomatic::DCPTime> audio_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;
+	std::shared_ptr<Film> _film;
+	std::shared_ptr<Player> _player;
 
 	VideoView* _video_view;
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	dcp::Size _inter_size;
-
 	/** Size of our output (including padding if we have any) */
 	dcp::Size _out_size;
 
@@ -187,7 +177,7 @@ private:
 	unsigned int _audio_block_size;
 	bool _playing;
 	int _suspended;
-	boost::shared_ptr<Butler> _butler;
+	std::shared_ptr<Butler> _butler;
 
 	std::list<Frame> _latency_history;
 	/** Mutex to protect _latency_history */
@@ -199,19 +189,12 @@ private:
 	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 _background_image;
-#endif
-
-	StateTimer _state_timer;
-	int _gets;
-
 	/** true if an get() is required next time we are idle */
 	bool _idle_get;