X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=11d06cc4643c329e8626bb156f7afa202276697c;hb=c9152723208a20542b147e8a879117d6a5a76a45;hp=ed7795dad3f1a96233a449412caca2d609aea09f;hpb=fe99d14e3047e9302e94db372923c92291016f1c;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index ed7795dad..11d06cc46 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -41,10 +41,13 @@ class Butler;
 class FilmViewer : public wxPanel
 {
 public:
-	FilmViewer (wxWindow *);
+	FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true);
 	~FilmViewer ();
 
 	void set_film (boost::shared_ptr<Film>);
+	boost::shared_ptr<Film> film () const {
+		return _film;
+	}
 
 	/** @return our `playhead' position; this may not lie exactly on a frame boundary */
 	DCPTime position () const {
@@ -52,9 +55,26 @@ public:
 	}
 
 	void set_position (DCPTime p);
+	void set_position (boost::shared_ptr<Content> content, ContentTime p);
 	void set_coalesce_player_changes (bool c);
+	void set_dcp_decode_reduction (boost::optional<int> reduction);
+	boost::optional<int> dcp_decode_reduction () const;
+
+	void slow_refresh ();
+	bool quick_refresh ();
+
+	int dropped () const {
+		return _dropped;
+	}
+
+	void start ();
+	bool stop ();
+	bool playing () const {
+		return _playing;
+	}
 
-	void refresh ();
+	void back_frame ();
+	void forward_frame ();
 
 	int audio_callback (void* out, unsigned int frames);
 
@@ -63,23 +83,26 @@ public:
 private:
 	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
-	void slider_moved ();
+	void slider_moved (bool page);
+	void slider_released ();
 	void play_clicked ();
 	void timer ();
 	void calculate_sizes ();
 	void check_play_state ();
 	void active_jobs_changed (boost::optional<std::string>);
-	void back_clicked (wxMouseEvent &);
-	void forward_clicked (wxMouseEvent &);
-	void player_changed (bool);
+	void rewind_clicked (wxMouseEvent &);
+	void back_clicked (wxKeyboardState& s);
+	void forward_clicked (wxKeyboardState &);
+	void player_changed (int, bool);
 	void update_position_label ();
 	void update_position_slider ();
 	void get ();
+	void display_player_video ();
 	void seek (DCPTime t, bool accurate);
 	void refresh_panel ();
 	void setup_sensitivity ();
 	void film_changed (Film::Property);
-	DCPTime nudge_amount (wxMouseEvent &);
+	DCPTime nudge_amount (wxKeyboardState &);
 	void timecode_clicked ();
 	void frame_number_clicked ();
 	void go_to (DCPTime t);
@@ -87,19 +110,21 @@ private:
 	void recreate_butler ();
 	void config_changed (Config::Property);
 	DCPTime time () const;
-	void start ();
-	bool stop ();
+	Frame average_latency () const;
+	DCPTime one_video_frame () const;
 
 	boost::shared_ptr<Film> _film;
 	boost::shared_ptr<Player> _player;
 
 	wxSizer* _v_sizer;
+	/** The area that we put our image in */
 	wxPanel* _panel;
 	wxCheckBox* _outline_content;
 	wxRadioButton* _left_eye;
 	wxRadioButton* _right_eye;
 	wxCheckBox* _jump_to_selected;
 	wxSlider* _slider;
+	wxButton* _rewind_button;
 	wxButton* _back_button;
 	wxButton* _forward_button;
 	wxStaticText* _frame_number;
@@ -107,8 +132,11 @@ private:
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 	bool _coalesce_player_changes;
-	bool _pending_player_change;
+	std::list<int> _pending_player_changes;
+	bool _slider_being_moved;
+	bool _was_running_before_slider;
 
+	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
 	boost::shared_ptr<const Image> _frame;
 	DCPTime _video_position;
 	Position<int> _inter_position;
@@ -118,11 +146,6 @@ private:
 	dcp::Size _out_size;
 	/** Size of the panel that we have available */
 	dcp::Size _panel_size;
-	/** true if the last call to Player::seek() 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_seek_accurate;
 
 	RtAudio _audio;
 	int _audio_channels;
@@ -130,5 +153,13 @@ private:
 	bool _playing;
 	boost::shared_ptr<Butler> _butler;
 
+	std::list<Frame> _latency_history;
+	/** Mutex to protect _latency_history */
+	mutable boost::mutex _latency_history_mutex;
+	int _latency_history_count;
+
+	int _dropped;
+	boost::optional<int> _dcp_decode_reduction;
+
 	boost::signals2::scoped_connection _config_changed_connection;
 };