Trim some includes.

[dcpomatic.git] / src / wx / closed_captions_dialog.h

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index cfdab5f3c2c39393e7eaefcb5fe1f6b5df991444..d31218526d745879ef553bd0004716177e0616c5 100644 (file)
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -18,24 +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);
 
        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 +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;
 };