Extract constants.h

[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 491a6fb1e4a8dfeb32e76dbcee2130635ef20105..903d47c7526ce98c36415fa90d74f36e67b68939 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -18,20 +18,23 @@
 
 */
 
+
 #include "closed_captions_dialog.h"
-#include "wx_util.h"
 #include "film_viewer.h"
-#include "lib/string_text.h"
+#include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/text_content.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
+#include "lib/string_text.h"
+#include "lib/text_content.h"
 #include <boost/bind/bind.hpp>
 
+
+using std::cout;
 using std::list;
+using std::make_pair;
 using std::max;
-using std::cout;
 using std::pair;
-using std::make_pair;
 using std::shared_ptr;
 using std::weak_ptr;
 using boost::optional;
@@ -40,6 +43,7 @@ using namespace boost::placeholders;
 #endif
 using namespace dcpomatic;
 
+
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
        : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
 #ifdef DCPOMATIC_OSX
@@ -201,7 +205,7 @@ ClosedCaptionsDialog::update ()
                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 +253,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) {