X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=6abd3387f6e0ecc3742abe142a9a2f33774b57c1;hb=a04c8a1b74c885a16327305ec1cc1ecd2b7ee0d6;hp=0235d225fc030eb125b48b96fbb7a2bf6eb60b07;hpb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0235d225f..6abd3387f 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -36,10 +36,21 @@ 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 set_position (DCPTime p);
+	void set_coalesce_player_changes (bool c);
+
+	void refresh ();
+
+	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+
 private:
 	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
@@ -48,11 +59,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 ();
@@ -71,6 +83,8 @@ private:
 	wxStaticText* _timecode;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
+	bool _coalesce_player_changes;
+	bool _pending_player_change;
 
 	boost::shared_ptr<const Image> _frame;
 	DCPTime _position;