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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 8194d0206..e28703fdd 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -23,11 +23,11 @@
 
 #include <wx/wx.h>
 #include "lib/film.h"
-#include "lib/decoder_factory.h"
 
 class wxToggleButton;
 class FFmpegPlayer;
 class Image;
+class RGBPlusAlphaImage;
 class Subtitle;
 
 /** @class FilmViewer
@@ -42,31 +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 (wxCommandEvent &);
+	void slider_moved (wxScrollEvent &);
 	void play_clicked (wxCommandEvent &);
 	void timer (wxTimerEvent &);
-	void process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+	void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
 	void calculate_sizes ();
 	void check_play_state ();
 	void update_from_raw ();
-	void decoder_changed ();
-	void seek_and_update (SourceFrame);
+	void update_from_decoder ();
+	void raw_to_display ();
+	void get_frame ();
+	void active_jobs_changed (bool);
+	void setup_player ();
 
 	boost::shared_ptr<Film> _film;
-	
+	boost::shared_ptr<Player> _player;
+
+	wxSizer* _v_sizer;
 	wxPanel* _panel;
 	wxSlider* _slider;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 
-	Decoders _decoders;
-	boost::shared_ptr<Image> _raw;
-	boost::shared_ptr<Image> _display;
+	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;
 
-	int _out_width;
-	int _out_height;
-	int _panel_width;
-	int _panel_height;
+	bool _clear_required;
 };