X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.h;h=dbe4b6aa51a048ba5152d2399fa7546cc0686a90;hb=a3c1ae7c2e46b65347341896b3d1a505ff92632b;hp=4117de2639a55d1e5fa64e64b29d242b0c6ea8b4;hpb=d902160e3c89a9f65f58a2463fac0b1de1d940b1;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 4117de263..dbe4b6aa5 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -18,25 +18,26 @@
 
 */
 
+
 #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);
+	ClosedCaptionsDialog(wxWindow* parent, FilmViewer* viewer);
 
 	void clear ();
-	void update_tracks (boost::shared_ptr<const Film> film);
-	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);
@@ -51,6 +52,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;
 };