X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fclosed_captions_dialog.h;h=fb4e9d59b40c5569e90a02c5013f28bd2a051531;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hp=4b47d593fc2a5ace624c1bf04c428506af311613;hpb=ff3b9789a0e0540f7a8677ec5eb644e21b6f262c;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 4b47d593f..fb4e9d59b 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,22 +20,32 @@
 
 #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 (explicit wxWindow* parent);
+	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
-	void update (DCPTime);
+	void update (dcpomatic::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 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;
+	std::vector<DCPTextTrack> _tracks;
+	boost::weak_ptr<Butler> _butler;
+	dcpomatic::DCPTime _last_update;
 };