X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_viewer.h;h=e28703fdd89ea9e3cbd9981ac39ead1edbbb103f;hb=7ebb57db2013c9e929d44d0e547ab1f27c59cc7f;hp=f290166c738c966f8a1bb8b1690573a50bd88c2a;hpb=8787bdd5b49150a46ca9ed554c06fd7caca98cce;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index f290166c7..e28703fdd 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -24,7 +24,11 @@
 #include <wx/wx.h>
 #include "lib/film.h"
 
+class wxToggleButton;
 class FFmpegPlayer;
+class Image;
+class RGBPlusAlphaImage;
+class Subtitle;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
@@ -38,7 +42,45 @@ public:
 
 private:
 	void film_changed (Film::Property);
+	void film_content_changed (int);
+	void paint_panel (wxPaintEvent &);
+	void panel_sized (wxSizeEvent &);
+	void slider_moved (wxScrollEvent &);
+	void play_clicked (wxCommandEvent &);
+	void timer (wxTimerEvent &);
+	void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
+	void calculate_sizes ();
+	void check_play_state ();
+	void update_from_raw ();
+	void update_from_decoder ();
+	void raw_to_display ();
+	void get_frame ();
+	void active_jobs_changed (bool);
+	void setup_player ();
 
 	boost::shared_ptr<Film> _film;
-	FFmpegPlayer* _player;
+	boost::shared_ptr<Player> _player;
+
+	wxSizer* _v_sizer;
+	wxPanel* _panel;
+	wxSlider* _slider;
+	wxToggleButton* _play_button;
+	wxTimer _timer;
+
+	boost::shared_ptr<Image> _raw_frame;
+	boost::shared_ptr<Subtitle> _raw_sub;
+	boost::shared_ptr<Image> _display_frame;
+	int _display_frame_x;
+	boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
+	Position _display_sub_position;
+	bool _got_frame;
+
+	/** Size of our output (including padding if we have any) */
+	libdcp::Size _out_size;
+	/** Size that we will make our film (equal to _out_size unless we have padding) */
+	libdcp::Size _film_size;
+	/** Size of the panel that we have available */
+	libdcp::Size _panel_size;
+
+	bool _clear_required;
 };