Happy new year.

[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 f2528a00f72eda67d8ee72a637384899c61b4861..7fcfc0808667a4d0d0271cda359044da98c5a088 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -149,7 +149,7 @@ private:
 void
 ClosedCaptionsDialog::update ()
 {
-       DCPTime const time = _viewer->time ();
+       auto const time = _viewer->time ();
 
        if (_current_in_lines && _current && _current->period.to > time) {
                /* Current one is fine */
@@ -167,10 +167,10 @@ ClosedCaptionsDialog::update ()
 
        if (!_current && !_tracks.empty()) {
                /* We have no current one: get another */
-               shared_ptr<Butler> butler = _butler.lock ();
+               auto butler = _butler.lock ();
                DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
                DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
-               DCPTextTrack track = _tracks[_track->GetSelection()];
+               auto track = _tracks[_track->GetSelection()];
                if (butler) {
                        while (true) {
                                optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
@@ -190,7 +190,7 @@ ClosedCaptionsDialog::update ()
        if (_current && _current->period.contains(time)) {
                /* We need to set this new one up */
 
-               list<StringText> to_show = _current->text.string;
+               auto to_show = _current->text.string;
 
                for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
                        _lines[j] = "";
@@ -198,10 +198,10 @@ ClosedCaptionsDialog::update ()
 
                to_show.sort (ClosedCaptionSorter());
 
-               list<StringText>::const_iterator j = to_show.begin();
+               auto j = to_show.begin();
                int k = 0;
                while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) {
-                       _lines[k] = j->text();
+                       _lines[k] = std_to_wx (j->text());
                        ++j;
                        ++k;
                }
@@ -249,7 +249,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 
        _track->Clear ();
        for (auto const& i: _tracks) {
-               _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language)));
+               _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language ? i.language->to_string() : wx_to_std(_("Unknown")))));
        }
 
        if (_track->GetCount() > 0) {