X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_viewer.h;h=f6ab1a567efed8e56be5c685aac38f61c88adc7b;hb=4eec47bf8397bb02dcb6d2cf57168195defbe288;hp=207004f29715b6a5958b478df586f24fb5124719;hpb=1eeba876ce09cedfa4c779bf3554372c01dc34c5;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 207004f29..f6ab1a567 100644
--- 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,10 +36,14 @@ class PlayerImage;
 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;
+	}
+
 private:
 	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
@@ -52,14 +56,19 @@ private:
 	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 ();
+	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 +79,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;
 };