Merge master.

[dcpomatic.git] / src / wx / film_viewer.h

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 859bf7edeb8939f2b8f042bcf9558996b679c700..0a535df9fdda804dd334f9793cc9171fec5d8702 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -23,16 +23,28 @@
 
 #include <wx/wx.h>
 #include "lib/film.h"
-#include "lib/decoder_factory.h"
 
 class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
-class Subtitle;
+class PlayerImage;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
+ *
+ *  The film takes the following path through the viewer:
+ *
+ *  1. fetch_next_frame() asks our _player to decode some data.  If it does, process_video()
+ *     will be called.
+ *
+ *  2. process_video() takes the image from the player (_frame).
+ *
+ *  3. fetch_next_frame() calls _panel->Refresh() and _panel->Update() which results in
+ *     paint_panel() being called; this creates frame_bitmap from _frame and blits it to the display.
+ *
+ * fetch_current_frame_again() asks the player to re-emit its current frame on the next pass(), and then
+ * starts from step #1.
  */
 class FilmViewer : public wxPanel
 {
@@ -42,47 +54,40 @@ public:
        void set_film (boost::shared_ptr<Film>);
 
 private:
-       void film_changed (Film::Property);
-       void paint_panel (wxPaintEvent &);
+       void paint_panel ();
        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 slider_moved ();
+       void play_clicked ();
+       void timer ();
+       void process_video (boost::shared_ptr<PlayerImage>, Eyes, DCPTime);
        void calculate_sizes ();
        void check_play_state ();
-       void update_from_raw ();
-       void decoder_changed ();
-       void raw_to_display ();
-       void get_frame ();
+       void fetch_current_frame_again ();
+       void fetch_next_frame ();
        void active_jobs_changed (bool);
+       void back_clicked ();
+       void forward_clicked ();
+       void player_changed (bool);
+       void set_position_text (DCPTime);
 
        boost::shared_ptr<Film> _film;
+       boost::shared_ptr<Player> _player;
 
        wxSizer* _v_sizer;
        wxPanel* _panel;
        wxSlider* _slider;
-       wxStaticText* _frame;
+       wxButton* _back_button;
+       wxButton* _forward_button;
+       wxStaticText* _frame_number;
        wxStaticText* _timecode;
        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;
+       boost::shared_ptr<const Image> _frame;
        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;
+       dcp::Size _out_size;
        /** Size of the panel that we have available */
-       libdcp::Size _panel_size;
+       dcp::Size _panel_size;
 };