X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=0e44994de565092c9aec2b155762b242aef683b3;hp=50f7dd2cb2122e3d3446e5e0202dd8ac5b49e6c6;hb=234bca29f70aeeba4fffd67f987de876ff89b6cc;hpb=76473252889949a02fa633daf2d40547142281ed

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 50f7dd2cb..0e44994de 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,11 +19,12 @@
 */
 
 /** @file  src/film_viewer.h
- *  @brief A wx widget to view `thumbnails' of a Film.
+ *  @brief FilmViewer class.
  */
 
 #include "lib/film.h"
 #include "lib/config.h"
+#include "lib/player_text.h"
 #include <RtAudio.h>
 #include <wx/wx.h>
 
@@ -34,32 +35,51 @@ class RGBPlusAlphaImage;
 class PlayerVideo;
 class Player;
 class Butler;
+class ClosedCaptionsDialog;
 
 /** @class FilmViewer
- *  @brief A wx widget to view a preview of a Film.
+ *  @brief A wx widget to view a Film.
  */
-class FilmViewer : public wxPanel
+class FilmViewer
 {
 public:
-	FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true);
+	FilmViewer (wxWindow *);
 	~FilmViewer ();
 
+	/** @return the panel showing the film's video */
+	wxPanel* panel () const {
+		return _panel;
+	}
+
+	void show_closed_captions ();
+
 	void set_film (boost::shared_ptr<Film>);
 	boost::shared_ptr<Film> film () const {
 		return _film;
 	}
 
+	void seek (DCPTime t, bool accurate);
+	void seek (boost::shared_ptr<Content> content, ContentTime p, bool accurate);
+	void seek_by (DCPTime by, bool accurate);
 	/** @return our `playhead' position; this may not lie exactly on a frame boundary */
 	DCPTime position () const {
 		return _video_position;
 	}
+	DCPTime one_video_frame () const;
+
+	void start ();
+	bool stop ();
+	bool playing () const {
+		return _playing;
+	}
 
-	void set_position (DCPTime 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 set_outline_content (bool o);
+	void set_eyes (Eyes e);
 
-	void refresh ();
+	void slow_refresh ();
 
 	int dropped () const {
 		return _dropped;
@@ -68,61 +88,42 @@ public:
 	int audio_callback (void* out, unsigned int frames);
 
 	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+	boost::signals2::signal<void ()> PositionChanged;
+	boost::signals2::signal<void ()> Started;
+	boost::signals2::signal<void ()> Stopped;
+	boost::signals2::signal<void ()> FilmChanged;
+
+	boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
 	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
-	void slider_moved (bool update_slider);
-	void play_clicked ();
 	void timer ();
 	void calculate_sizes ();
-	void check_play_state ();
-	void active_jobs_changed (boost::optional<std::string>);
-	void rewind_clicked (wxMouseEvent &);
-	void back_clicked (wxMouseEvent &);
-	void forward_clicked (wxMouseEvent &);
-	void player_changed (bool);
-	void update_position_label ();
-	void update_position_slider ();
+	void player_change (ChangeType type, int, bool);
 	void get ();
-	void seek (DCPTime t, bool accurate);
-	void refresh_panel ();
-	void setup_sensitivity ();
-	void film_changed (Film::Property);
-	DCPTime nudge_amount (wxMouseEvent &);
-	void timecode_clicked ();
-	void frame_number_clicked ();
-	void go_to (DCPTime t);
-	void jump_to_selected_clicked ();
+	void display_player_video ();
+	void film_change (ChangeType, Film::Property);
 	void recreate_butler ();
 	void config_changed (Config::Property);
+
 	DCPTime time () const;
-	void start ();
-	bool stop ();
+	DCPTime uncorrected_time () const;
 	Frame average_latency () const;
-	DCPTime one_video_frame () const;
+
+	void refresh_panel ();
+	bool quick_refresh ();
 
 	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;
-	wxStaticText* _timecode;
-	wxToggleButton* _play_button;
 	wxTimer _timer;
 	bool _coalesce_player_changes;
-	bool _pending_player_change;
+	std::list<int> _pending_player_changes;
 
+	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
 	boost::shared_ptr<const Image> _frame;
 	DCPTime _video_position;
 	Position<int> _inter_position;
@@ -132,11 +133,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;
@@ -152,5 +148,10 @@ private:
 	int _dropped;
 	boost::optional<int> _dcp_decode_reduction;
 
+	ClosedCaptionsDialog* _closed_captions_dialog;
+
+	bool _outline_content;
+	Eyes _eyes;
+
 	boost::signals2::scoped_connection _config_changed_connection;
 };