*/
+
#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/film.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;
#endif
using namespace dcpomatic;
+
ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
: wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
#ifdef DCPOMATIC_OSX
_lines[j] = "";
}
- to_show.sort (ClosedCaptionSorter());
+ std::sort(to_show.begin(), to_show.end(), ClosedCaptionSorter());
auto j = to_show.begin();
int k = 0;
_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) {