X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.h;h=1f0e450ff3203bc632ec2601d898af05a57963c6;hb=70b72b53eab0f247eb4dc605a2d669d4adb4e469;hp=4b407fa5a7a7c49ae2631ace6979cba235b88bc9;hpb=8969587a712a76fefbe929823c1aa0984ae798e8;p=dcpomatic.git diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h index 4b407fa5a..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; @@ -31,11 +34,13 @@ class ClosedCaptionsDialog : public wxDialog public: explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer); - void update (DCPTime); 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); + void update (); void paint (); void track_selected (); @@ -46,6 +51,6 @@ private: bool _current_in_lines; std::vector _lines; std::vector _tracks; - boost::weak_ptr _butler; - DCPTime _last_update; + std::weak_ptr _butler; + wxTimer _timer; };