X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.h;h=700b8922a9506073df558c9a1722d7a527048e6c;hb=4b76291eb0328840de4c5938a1be6340e5dea0fe;hp=cfdab5f3c2c39393e7eaefcb5fe1f6b5df991444;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index cfdab5f3c..700b8922a 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -18,24 +18,27 @@
 
 */
 
+
 #include "lib/dcpomatic_time.h"
 #include "lib/player.h"
 #include "lib/text_ring_buffers.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 class Butler;
 class FilmViewer;
 
+
 class ClosedCaptionsDialog : public wxDialog
 {
 public:
 	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
 	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);
@@ -50,6 +53,6 @@ private:
 	bool _current_in_lines;
 	std::vector<wxString> _lines;
 	std::vector<DCPTextTrack> _tracks;
-	boost::weak_ptr<Butler> _butler;
+	std::weak_ptr<Butler> _butler;
 	wxTimer _timer;
 };