X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.h;h=1f0e450ff3203bc632ec2601d898af05a57963c6;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=5c366ca7b0dbe2cc9d9f61e8eba4002b5e71c6ff;hpb=579d18cb7770efe2da03afaf6a33faaf624119e3;p=dcpomatic.git diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h index 5c366ca7b..1f0e450ff 100644 --- a/src/wx/closed_captions_dialog.h +++ b/src/wx/closed_captions_dialog.h @@ -21,7 +21,10 @@ #include "lib/dcpomatic_time.h" #include "lib/player.h" #include "lib/text_ring_buffers.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS class Butler; class FilmViewer; @@ -32,7 +35,8 @@ public: explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer); void clear (); - void set_film_and_butler (boost::shared_ptr, boost::weak_ptr); + void update_tracks (std::shared_ptr film); + void set_butler (std::weak_ptr); private: void shown (wxShowEvent); @@ -47,6 +51,6 @@ private: bool _current_in_lines; std::vector _lines; std::vector _tracks; - boost::weak_ptr _butler; + std::weak_ptr _butler; wxTimer _timer; };