X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=c81c65acd782d4deb26cb1e7c37c1c540e308955;hb=9bdd8cc51942a13e360dde4efc04b3ca417c8b94;hp=c6b5e7c0c5530ec871f4b04df919a48b97b83de8;hpb=420adb1fd2910fd24eb84be98169afc209f76a0e;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index c6b5e7c0c..c81c65acd 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -23,7 +23,6 @@
 
 #include <wx/wx.h>
 #include "lib/film.h"
-#include "lib/decoder_factory.h"
 
 class wxToggleButton;
 class FFmpegPlayer;
@@ -33,6 +32,25 @@ class Subtitle;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
+ *
+ *  The film takes the following path through the viewer:
+ *
+ *  1.  get_frame() asks our _player to decode some data.  If it does, process_video()
+ *      will be called.
+ *
+ *  2.  process_video() takes the image and subtitle from the decoder (_raw_frame and _raw_sub)
+ *      and calls raw_to_display().
+ * 
+ *  3.  raw_to_display() copies _raw_frame to _display_frame, processing it and scaling it.
+ *
+ *  4.  calling _panel->Refresh() and _panel->Update() results in paint_panel() being called;
+ *      this creates frame_bitmap from _display_frame and blits it to the display.  It also
+ *      blits the subtitle, if required.
+ *
+ * update_from_decoder() asks the player to re-emit its current frame on the next pass(), and then
+ * starts from step #1.
+ *
+ * update_from_raw() starts at step #3, then calls _panel->Refresh and _panel->Update.
  */
 class FilmViewer : public wxPanel
 {
@@ -43,6 +61,7 @@ public:
 
 private:
 	void film_changed (Film::Property);
+	void film_content_changed (boost::weak_ptr<Content>, int);
 	void paint_panel (wxPaintEvent &);
 	void panel_sized (wxSizeEvent &);
 	void slider_moved (wxScrollEvent &);
@@ -52,12 +71,13 @@ private:
 	void calculate_sizes ();
 	void check_play_state ();
 	void update_from_raw ();
-	void decoder_changed ();
+	void update_from_decoder ();
 	void raw_to_display ();
 	void get_frame ();
 	void active_jobs_changed (bool);
 
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Player> _player;
 
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
@@ -65,18 +85,21 @@ private:
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 
-	Decoders _decoders;
 	boost::shared_ptr<Image> _raw_frame;
 	boost::shared_ptr<Subtitle> _raw_sub;
 	boost::shared_ptr<Image> _display_frame;
+	/* The x offset at which we display the actual film content; this corresponds
+	   to the film's padding converted to our coordinates.
+	*/
+	int _display_frame_x;
 	boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
 	Position _display_sub_position;
 	bool _got_frame;
 
-	int _out_width;
-	int _out_height;
-	int _panel_width;
-	int _panel_height;
-
-	bool _clear_required;
+	/** 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;
 };