X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=9142500e0547bffa28534d21b40e584c18c9c612;hb=HEAD;hp=4519c4b7cdd4b0fbc1398d1f32fad7c6ed7341ca;hpb=9ff6d1b786c52d0aae485507d96ea67f3171b9fd;p=dcpomatic.git diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index 4519c4b7c..9142500e0 100644 --- a/src/wx/closed_captions_dialog.cc +++ b/src/wx/closed_captions_dialog.cc @@ -18,25 +18,33 @@ */ + #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 +#include "lib/constants.h" +#include "lib/film.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 boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +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 @@ -55,12 +63,12 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer , _current_in_lines (false) , _timer (this) { - _lines.resize (CLOSED_CAPTION_LINES); + _lines.resize (MAX_CLOSED_CAPTION_LINES); wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (track_sizer, this, _("Track"), true); + add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP); @@ -101,16 +109,16 @@ ClosedCaptionsDialog::paint () dc.SetTextForeground (*wxWHITE); /* Choose a font which fits vertically */ - int const line_height = max (8, dc.GetSize().GetHeight() / CLOSED_CAPTION_LINES); + int const line_height = max (8, dc.GetSize().GetHeight() / MAX_CLOSED_CAPTION_LINES); wxFont font (*wxNORMAL_FONT); font.SetPixelSize (wxSize (0, line_height * 0.8)); dc.SetFont (font); - for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) { - wxString const good = _lines[i].Left (CLOSED_CAPTION_LENGTH); + for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) { + wxString const good = _lines[i].Left (MAX_CLOSED_CAPTION_LENGTH); dc.DrawText (good, 8, line_height * i); - if (_lines[i].Length() > CLOSED_CAPTION_LENGTH) { - wxString const bad = _lines[i].Right (_lines[i].Length() - CLOSED_CAPTION_LENGTH); + if (_lines[i].Length() > MAX_CLOSED_CAPTION_LENGTH) { + wxString const bad = _lines[i].Right (_lines[i].Length() - MAX_CLOSED_CAPTION_LENGTH); wxSize size = dc.GetTextExtent (good); dc.SetTextForeground (*wxRED); dc.DrawText (bad, 8 + size.GetWidth(), line_height * i); @@ -131,11 +139,11 @@ private: float from_top (StringText const & c) const { switch (c.v_align()) { - case dcp::VALIGN_TOP: + case dcp::VAlign::TOP: return c.v_position(); - case dcp::VALIGN_CENTER: + case dcp::VAlign::CENTER: return c.v_position() + 0.5; - case dcp::VALIGN_BOTTOM: + case dcp::VAlign::BOTTOM: return 1.0 - c.v_position(); } DCPOMATIC_ASSERT (false); @@ -146,7 +154,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 */ @@ -155,7 +163,7 @@ ClosedCaptionsDialog::update () if (_current && _current->period.to < time) { /* Current one has finished; clear out */ - for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) { + for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) { _lines[j] = ""; } Refresh (); @@ -164,10 +172,10 @@ ClosedCaptionsDialog::update () if (!_current && !_tracks.empty()) { /* We have no current one: get another */ - shared_ptr 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 d = butler->get_closed_caption (); @@ -187,18 +195,18 @@ ClosedCaptionsDialog::update () if (_current && _current->period.contains(time)) { /* We need to set this new one up */ - list to_show = _current->text.string; + auto to_show = _current->text.string; - for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) { + for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) { _lines[j] = ""; } - to_show.sort (ClosedCaptionSorter()); + std::sort(to_show.begin(), to_show.end(), ClosedCaptionSorter()); - list::const_iterator j = to_show.begin(); + auto j = to_show.begin(); int k = 0; - while (j != to_show.end() && k < CLOSED_CAPTION_LINES) { - _lines[k] = j->text(); + while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) { + _lines[k] = std_to_wx (j->text()); ++j; ++k; } @@ -208,7 +216,7 @@ ClosedCaptionsDialog::update () } if (!_current && _tracks.empty()) { - for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) { + for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) { _lines[i] = wxString(); } } @@ -234,9 +242,9 @@ ClosedCaptionsDialog::update_tracks (shared_ptr film) { _tracks.clear (); - BOOST_FOREACH (shared_ptr i, film->content()) { - BOOST_FOREACH (shared_ptr j, i->text) { - if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) { + for (auto i: film->content()) { + for (auto j: i->text) { + if (j->use() && j->type() == TextType::CLOSED_CAPTION && j->dcp_track()) { if (find(_tracks.begin(), _tracks.end(), j->dcp_track()) == _tracks.end()) { _tracks.push_back (*j->dcp_track()); } @@ -245,8 +253,8 @@ ClosedCaptionsDialog::update_tracks (shared_ptr film) } _track->Clear (); - BOOST_FOREACH (DCPTextTrack const & i, _tracks) { - _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language))); + for (auto const& i: _tracks) { + _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) {