X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=4f34f0531343dce91e946f90cda89b17c2c0d5bb;hp=b81414bed9f72b37a0e638cf6545a19440685fae;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=1db0293ad36605da9ca8daa8736ef581f4f6a34e diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index b81414bed..4f34f0531 100644 --- a/src/wx/closed_captions_dialog.cc +++ b/src/wx/closed_captions_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -19,56 +19,101 @@ */ #include "closed_captions_dialog.h" +#include "wx_util.h" +#include "film_viewer.h" #include "lib/string_text.h" #include "lib/butler.h" -#include +#include "lib/text_content.h" +#include "lib/compose.hpp" +#include using std::list; 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) - /* XXX: empirical and probably unhelpful default size here; needs to be related to font metrics */ - : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxSize(640, (640 / 10) + 64), +ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer) + : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize, #ifdef DCPOMATIC_OSX - /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps - the window above all others (and not just our own) it's better than nothing for now. - */ - wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP + /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps + the window above all others (and not just our own) it's better than nothing for now. + */ + wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP #else - wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT + wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT #endif ) + , _viewer (viewer) + /* XXX: empirical and probably unhelpful default size here; needs to be related to font metrics */ + , _display (new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(640, (640 / 10) + 64))) + , _track (new wxChoice(this, wxID_ANY)) , _current_in_lines (false) + , _timer (this) { - _lines.resize (CLOSED_CAPTION_LINES); - Bind (wxEVT_PAINT, boost::bind (&ClosedCaptionsDialog::paint, this)); + _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, 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); + sizer->Add (_display, 1, wxEXPAND); + + Bind (wxEVT_SHOW, boost::bind(&ClosedCaptionsDialog::shown, this, _1)); + Bind (wxEVT_TIMER, boost::bind(&ClosedCaptionsDialog::update, this)); + _display->Bind (wxEVT_PAINT, boost::bind(&ClosedCaptionsDialog::paint, this)); + _track->Bind (wxEVT_CHOICE, boost::bind(&ClosedCaptionsDialog::track_selected, this)); + + SetSizerAndFit (sizer); +} + +void +ClosedCaptionsDialog::shown (wxShowEvent ev) +{ + if (ev.IsShown ()) { + _timer.Start (40); + } else { + _timer.Stop (); + } +} + +void +ClosedCaptionsDialog::track_selected () +{ + _current = optional (); + _viewer->slow_refresh (); + update (); } void ClosedCaptionsDialog::paint () { - wxPaintDC dc (this); + wxPaintDC dc (_display); dc.SetBackground (*wxBLACK_BRUSH); dc.Clear (); 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); @@ -102,28 +147,44 @@ private: }; void -ClosedCaptionsDialog::update (DCPTime time) +ClosedCaptionsDialog::update () { - if (_current_in_lines && _current->period.to > time) { + DCPTime const time = _viewer->time (); + + if (_current_in_lines && _current && _current->period.to > time) { /* Current one is fine */ return; } 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 (); _current = optional(); } - if (!_current) { + if (!_current && !_tracks.empty()) { /* We have no current one: get another */ shared_ptr butler = _butler.lock (); - DCPOMATIC_ASSERT (butler); - _current = butler->get_closed_caption (); - _current_in_lines = false; + DCPOMATIC_ASSERT (_track->GetSelection() >= 0); + DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size())); + DCPTextTrack track = _tracks[_track->GetSelection()]; + if (butler) { + while (true) { + optional d = butler->get_closed_caption (); + if (!d) { + break; + } + if (d->track == track) { + _current = d; + break; + } + } + + _current_in_lines = false; + } } if (_current && _current->period.contains(time)) { @@ -131,7 +192,7 @@ ClosedCaptionsDialog::update (DCPTime time) list 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] = ""; } @@ -139,7 +200,7 @@ ClosedCaptionsDialog::update (DCPTime time) list::const_iterator j = to_show.begin(); int k = 0; - while (j != to_show.end() && k < CLOSED_CAPTION_LINES) { + while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) { _lines[k] = j->text(); ++j; ++k; @@ -148,6 +209,12 @@ ClosedCaptionsDialog::update (DCPTime time) Refresh (); _current_in_lines = true; } + + if (!_current && _tracks.empty()) { + for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) { + _lines[i] = wxString(); + } + } } void @@ -158,8 +225,36 @@ ClosedCaptionsDialog::clear () Refresh (); } + void ClosedCaptionsDialog::set_butler (weak_ptr butler) { _butler = butler; } + +void +ClosedCaptionsDialog::update_tracks (shared_ptr film) +{ + _tracks.clear (); + + for (auto i: film->content()) { + for (auto j: i->text) { + if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) { + if (find(_tracks.begin(), _tracks.end(), j->dcp_track()) == _tracks.end()) { + _tracks.push_back (*j->dcp_track()); + } + } + } + } + + _track->Clear (); + for (auto const& i: _tracks) { + _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language))); + } + + if (_track->GetCount() > 0) { + _track->SetSelection (0); + } + + track_selected (); +}