X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=903d47c7526ce98c36415fa90d74f36e67b68939;hb=45bc91b9a909035252ee10afe4fed2eef996e4ed;hp=e386beccf1938462d181c36a9074d02d5986b92a;hpb=32bb675c45d8d7582f11851563ea3216f60ee319;p=dcpomatic.git diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index e386beccf..903d47c75 100644 --- 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 + +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 @@ -249,7 +253,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr 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) {