Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0235d225fc030eb125b48b96fbb7a2bf6eb60b07..4776d24b48cc37976a5036e3e991056117e5b9de 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -36,10 +36,18 @@ class PlayerVideo;
 class FilmViewer : public wxPanel
 {
 public:
-       FilmViewer (boost::shared_ptr<Film>, wxWindow *);
+       FilmViewer (wxWindow *);
 
        void set_film (boost::shared_ptr<Film>);
 
+       DCPTime position () const {
+               return _position;
+       }
+
+       void refresh ();
+
+       boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+
 private:
        void paint_panel ();
        void panel_sized (wxSizeEvent &);
@@ -48,11 +56,12 @@ private:
        void timer ();
        void calculate_sizes ();
        void check_play_state ();
-       void active_jobs_changed (bool);
+       void active_jobs_changed (boost::optional<std::string>);
        void back_clicked ();
        void forward_clicked ();
        void player_changed (bool);
-       void set_position_text ();
+       void update_position_label ();
+       void update_position_slider ();
        void get (DCPTime, bool);
        void refresh_panel ();
        void setup_sensitivity ();