X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;fp=src%2Fwx%2Ffilm_viewer.h;h=02d862ca0c42472dd8cefb6de594b116725e6a68;hp=ed5874fbcc6f945d6285db27bbe74801998fb893;hb=f861018389acd9d277fe34d7621182b9b54f977f;hpb=86011ad6b4ea0004a51c59b0563cf89c0947546d

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index ed5874fbc..02d862ca0 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,7 +71,7 @@ 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);
@@ -60,6 +79,7 @@ private:
 	void forward_clicked (wxCommandEvent &);
 
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Player> _player;
 
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
@@ -71,7 +91,6 @@ private:
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 
-	Decoders _decoders;
 	boost::shared_ptr<const Image> _raw_frame;
 	boost::shared_ptr<Subtitle> _raw_sub;
 	boost::shared_ptr<const Image> _display_frame;