Merge master.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index bf956ef95d3dc29ce2378d9261aaefbf5ac64f8e..c81c65acd782d4deb26cb1e7c37c1c540e308955 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -61,7 +61,7 @@ public:
 
 private:
        void film_changed (Film::Property);
-       void film_content_changed (int);
+       void film_content_changed (boost::weak_ptr<Content>, int);
        void paint_panel (wxPaintEvent &);
        void panel_sized (wxSizeEvent &);
        void slider_moved (wxScrollEvent &);
@@ -75,7 +75,6 @@ private:
        void raw_to_display ();
        void get_frame ();
        void active_jobs_changed (bool);
-       void setup_player ();
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
@@ -89,6 +88,9 @@ private:
        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;
@@ -100,6 +102,4 @@ private:
        libdcp::Size _film_size;
        /** Size of the panel that we have available */
        libdcp::Size _panel_size;
-
-       bool _clear_required;
 };