X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fclosed_captions_dialog.h;h=dbe4b6aa51a048ba5152d2399fa7546cc0686a90;hb=eb3301dbdf655a36c98f50eb9b4adcfe4d1dad0c;hp=fb4e9d59b40c5569e90a02c5013f28bd2a051531;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index fb4e9d59b..dbe4b6aa5 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -18,24 +18,30 @@
 
 */
 
+
 #include "lib/dcpomatic_time.h"
-#include "lib/player.h"
 #include "lib/text_ring_buffers.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 class Butler;
 class FilmViewer;
 
+
 class ClosedCaptionsDialog : public wxDialog
 {
 public:
-	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
+	ClosedCaptionsDialog(wxWindow* parent, FilmViewer* viewer);
 
-	void update (dcpomatic::DCPTime);
 	void clear ();
-	void set_film_and_butler (boost::shared_ptr<Film>, 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 ();
 
@@ -46,6 +52,6 @@ private:
 	bool _current_in_lines;
 	std::vector<wxString> _lines;
 	std::vector<DCPTextTrack> _tracks;
-	boost::weak_ptr<Butler> _butler;
-	dcpomatic::DCPTime _last_update;
+	std::weak_ptr<Butler> _butler;
+	wxTimer _timer;
 };