Improve layout of drive-wipe warning dialogue.

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

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 8e007c38fcae29daf93438cd986c6f49b00c0d10..afcf5fa876f97b35d0cf66bf9765cf379e0afa13 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -35,6 +35,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
        : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
@@ -52,6 +53,7 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
         , _display (new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(640, (640 / 10) + 64)))
        , _track (new wxChoice(this, wxID_ANY))
        , _current_in_lines (false)
+       , _timer (this)
 {
        _lines.resize (CLOSED_CAPTION_LINES);
 
@@ -64,18 +66,30 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
        sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
        sizer->Add (_display, 1, wxEXPAND);
 
+       Bind (wxEVT_SHOW, boost::bind(&ClosedCaptionsDialog::shown, this, _1));
+       Bind (wxEVT_TIMER, boost::bind(&ClosedCaptionsDialog::update, this));
        _display->Bind (wxEVT_PAINT, boost::bind(&ClosedCaptionsDialog::paint, this));
        _track->Bind (wxEVT_CHOICE, boost::bind(&ClosedCaptionsDialog::track_selected, this));
 
        SetSizerAndFit (sizer);
 }
 
+void
+ClosedCaptionsDialog::shown (wxShowEvent ev)
+{
+       if (ev.IsShown ()) {
+               _timer.Start (40);
+       } else {
+               _timer.Stop ();
+       }
+}
+
 void
 ClosedCaptionsDialog::track_selected ()
 {
        _current = optional<TextRingBuffers::Data> ();
        _viewer->slow_refresh ();
-       update (_last_update);
+       update ();
 }
 
 void
@@ -130,9 +144,9 @@ private:
 };
 
 void
-ClosedCaptionsDialog::update (DCPTime time)
+ClosedCaptionsDialog::update ()
 {
-       _last_update = time;
+       DCPTime const time = _viewer->time ();
 
        if (_current_in_lines && _current && _current->period.to > time) {
                /* Current one is fine */
@@ -148,10 +162,11 @@ ClosedCaptionsDialog::update (DCPTime time)
                _current = optional<TextRingBuffers::Data>();
        }
 
-       if (!_current) {
+       if (!_current && !_tracks.empty()) {
                /* We have no current one: get another */
                shared_ptr<Butler> butler = _butler.lock ();
                DCPOMATIC_ASSERT (butler);
+               DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
                DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
                DCPTextTrack track = _tracks[_track->GetSelection()];
                while (true) {