Merge master.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 1340f37fba81d41858c3b123af0ef4caa5e965bf..0a535df9fdda804dd334f9793cc9171fec5d8702 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,6 +28,7 @@ class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
+class PlayerImage;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
@@ -53,20 +54,21 @@ public:
        void set_film (boost::shared_ptr<Film>);
 
 private:
-       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<const Image>, Time);
+       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 fetch_current_frame_again ();
        void fetch_next_frame ();
        void active_jobs_changed (bool);
-       void back_clicked (wxCommandEvent &);
-       void forward_clicked (wxCommandEvent &);
+       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;
@@ -85,9 +87,7 @@ private:
        bool _got_frame;
 
        /** Size of our output (including padding if we have any) */
-       libdcp::Size _out_size;
+       dcp::Size _out_size;
        /** Size of the panel that we have available */
-       libdcp::Size _panel_size;
-
-       std::list<std::pair<boost::shared_ptr<const Image>, Time> > _queue;
+       dcp::Size _panel_size;
 };