X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.h;h=1f0e450ff3203bc632ec2601d898af05a57963c6;hb=e72a69ac2ebf24df05ba4b6de65bfa338a58b0ec;hp=3da7f65225b7fc5330c928036c6bdbe9c8f387b3;hpb=3a7b6acdb993864f319a6ceb3bc4c3fb7d4aaefd;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 3da7f6522..1f0e450ff 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,37 @@
 
 #include "lib/dcpomatic_time.h"
 #include "lib/player.h"
+#include "lib/text_ring_buffers.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class Butler;
+class FilmViewer;
 
 class ClosedCaptionsDialog : public wxDialog
 {
 public:
-	explicit ClosedCaptionsDialog (wxWindow* parent);
+	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
-	void update (DCPTime);
 	void clear ();
-	void set_butler (boost::weak_ptr<Butler>);
+	void update_tracks (std::shared_ptr<const Film> film);
+	void set_butler (std::weak_ptr<Butler>);
 
 private:
+	void shown (wxShowEvent);
+	void update ();
 	void paint ();
+	void track_selected ();
 
-	boost::optional<std::pair<PlayerText, DCPTimePeriod> > _current;
+	FilmViewer* _viewer;
+	wxPanel* _display;
+	wxChoice* _track;
+	boost::optional<TextRingBuffers::Data> _current;
 	bool _current_in_lines;
 	std::vector<wxString> _lines;
-	boost::weak_ptr<Butler> _butler;
+	std::vector<DCPTextTrack> _tracks;
+	std::weak_ptr<Butler> _butler;
+	wxTimer _timer;
 };