X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fclosed_captions_dialog.h;h=5c366ca7b0dbe2cc9d9f61e8eba4002b5e71c6ff;hb=b3b371294ed5e6cc18ef64ba1b06ca76726b903a;hp=a599bc7036f8d048bb421a64fe30a9e974a506d8;hpb=ded71cffd18962ebb6b9611a5eb6dfafe9e8e4ec;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index a599bc703..5c366ca7b 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,24 +20,33 @@
 
 #include "lib/dcpomatic_time.h"
 #include "lib/player.h"
+#include "lib/text_ring_buffers.h"
 #include <wx/wx.h>
 
-class Player;
+class Butler;
+class FilmViewer;
 
 class ClosedCaptionsDialog : public wxDialog
 {
 public:
-	ClosedCaptionsDialog (wxWindow* parent);
+	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
-	void update (DCPTime);
 	void clear ();
-	void set_player (boost::weak_ptr<Player>);
+	void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
 
 private:
+	void shown (wxShowEvent);
+	void update ();
 	void paint ();
+	void track_selected ();
 
+	FilmViewer* _viewer;
+	wxPanel* _display;
+	wxChoice* _track;
+	boost::optional<TextRingBuffers::Data> _current;
+	bool _current_in_lines;
 	std::vector<wxString> _lines;
-	boost::weak_ptr<Player> _player;
-	static int const _num_lines;
-	static int const _num_chars_per_line;
+	std::vector<DCPTextTrack> _tracks;
+	boost::weak_ptr<Butler> _butler;
+	wxTimer _timer;
 };