X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=02d862ca0c42472dd8cefb6de594b116725e6a68;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=0f7b142b50f55630b04dabad29f41550481336c5;hpb=d62877ae6c4e316e43f4052e4b9ba673610012cf;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0f7b142b5..02d862ca0 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -61,12 +61,13 @@ public:
 
 private:
 	void film_changed (Film::Property);
+	void film_content_changed (boost::weak_ptr<Content>, int);
 	void paint_panel (wxPaintEvent &);
 	void panel_sized (wxSizeEvent &);
 	void slider_moved (wxScrollEvent &);
 	void play_clicked (wxCommandEvent &);
 	void timer (wxTimerEvent &);
-	void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
+	void process_video (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, double);
 	void calculate_sizes ();
 	void check_play_state ();
 	void update_from_raw ();
@@ -74,6 +75,8 @@ private:
 	void raw_to_display ();
 	void get_frame ();
 	void active_jobs_changed (bool);
+	void back_clicked (wxCommandEvent &);
+	void forward_clicked (wxCommandEvent &);
 
 	boost::shared_ptr<Film> _film;
 	boost::shared_ptr<Player> _player;
@@ -81,12 +84,19 @@ private:
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
 	wxSlider* _slider;
+	wxButton* _back_button;
+	wxButton* _forward_button;
+	wxStaticText* _frame;
+	wxStaticText* _timecode;
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 
-	boost::shared_ptr<Image> _raw_frame;
+	boost::shared_ptr<const Image> _raw_frame;
 	boost::shared_ptr<Subtitle> _raw_sub;
-	boost::shared_ptr<Image> _display_frame;
+	boost::shared_ptr<const 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;