X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=ea203d052d0e441da07b12bf43aea1cebe1147ec;hb=23583dfb56181c76126e652042e9d1940367aa27;hp=eed6c283d8ca811ac568e7d35c27f937001fd781;hpb=83cc718cc4f38bc2a9cc8cd62ed570415c5ba289;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index eed6c283d..ea203d052 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.
 
@@ -24,6 +24,7 @@
 
 #include "lib/film.h"
 #include "lib/config.h"
+#include "lib/player_text.h"
 #include <RtAudio.h>
 #include <wx/wx.h>
 
@@ -34,16 +35,21 @@ class RGBPlusAlphaImage;
 class PlayerVideo;
 class Player;
 class Butler;
+class ClosedCaptionsDialog;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
  */
-class FilmViewer : public wxPanel
+class FilmViewer
 {
 public:
 	FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true);
 	~FilmViewer ();
 
+	wxPanel* panel () const {
+		return _panel;
+	}
+
 	void set_film (boost::shared_ptr<Film>);
 	boost::shared_ptr<Film> film () const {
 		return _film;
@@ -55,6 +61,7 @@ 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;
@@ -72,68 +79,47 @@ public:
 		return _playing;
 	}
 
-	void back_frame ();
-	void forward_frame ();
+	void move (DCPTime by);
+	DCPTime one_video_frame () const;
+	void seek (DCPTime t, bool accurate);
+	DCPTime video_position () const {
+		return _video_position;
+	}
 
 	int audio_callback (void* out, unsigned int frames);
 
+	void show_closed_captions ();
+
 	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
 
 private:
 	void paint_panel ();
 	void panel_sized (wxSizeEvent &);
-	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 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 player_change (ChangeType type, int, bool);
 	void get ();
 	void display_player_video ();
-	void seek (DCPTime t, bool accurate);
 	void refresh_panel ();
-	void setup_sensitivity ();
-	void film_changed (Film::Property);
+	void film_change (ChangeType, Film::Property);
 	DCPTime nudge_amount (wxKeyboardState &);
 	void timecode_clicked ();
-	void frame_number_clicked ();
 	void go_to (DCPTime t);
-	void jump_to_selected_clicked ();
 	void recreate_butler ();
 	void config_changed (Config::Property);
 	DCPTime time () const;
+	DCPTime uncorrected_time () const;
 	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;
-	wxStaticText* _timecode;
-	wxToggleButton* _play_button;
 	wxTimer _timer;
 	bool _coalesce_player_changes;
 	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;
@@ -160,5 +146,7 @@ private:
 	int _dropped;
 	boost::optional<int> _dcp_decode_reduction;
 
+	ClosedCaptionsDialog* _closed_captions_dialog;
+
 	boost::signals2::scoped_connection _config_changed_connection;
 };