Merge master.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 207004f29715b6a5958b478df586f24fb5124719..e502c6f45cd2922e3d9fe90c32fe7553c67d83a6 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,7 +28,7 @@ class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
-class PlayerImage;
+class PlayerVideo;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
@@ -36,7 +36,7 @@ class PlayerImage;
 class FilmViewer : public wxPanel
 {
 public:
-       FilmViewer (boost::shared_ptr<Film>, wxWindow *);
+       FilmViewer (wxWindow *);
 
        void set_film (boost::shared_ptr<Film>);
 
@@ -54,12 +54,16 @@ private:
        void player_changed (bool);
        void set_position_text ();
        void get (DCPTime, bool);
+       void refresh_panel ();
+       void setup_sensitivity ();
+       void film_changed (Film::Property);
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
 
        wxSizer* _v_sizer;
        wxPanel* _panel;
+       wxCheckBox* _outline_content;
        wxSlider* _slider;
        wxButton* _back_button;
        wxButton* _forward_button;
@@ -70,9 +74,19 @@ private:
 
        boost::shared_ptr<const Image> _frame;
        DCPTime _position;
+       Position<int> _inter_position;
+       dcp::Size _inter_size;
 
        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
        /** Size of the panel that we have available */
        dcp::Size _panel_size;
+       /** true if the last call to ::get() was specified to be accurate;
+        *  this is used so that when re-fetching the current frame we
+        *  can get the same one that we got last time.
+        */
+       bool _last_get_accurate;
+
+       boost::signals2::scoped_connection _film_connection;
+       boost::signals2::scoped_connection _player_connection;
 };