X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=061262cddcc96eff127cac8dfcf5b8661e587f77;hp=ea7db88f02375ffb17bf29f993ece7f9038cf005;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hpb=ae4f0d9f55489ddc50b3e5f0d713621ee8f50645 diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index ea7db88f0..061262cdd 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,37 +19,70 @@ */ #include "closed_captions_dialog.h" +#include "wx_util.h" +#include "film_viewer.h" #include "lib/string_text.h" +#include "lib/butler.h" +#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 boost::optional; +using namespace dcpomatic; -ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent) +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) { _lines.resize (CLOSED_CAPTION_LINES); - Bind (wxEVT_PAINT, boost::bind (&ClosedCaptionsDialog::paint, this)); + + wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + + wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL); + add_label_to_sizer (track_sizer, this, _("Track"), true); + 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); + + _display->Bind (wxEVT_PAINT, boost::bind(&ClosedCaptionsDialog::paint, this)); + _track->Bind (wxEVT_CHOICE, boost::bind(&ClosedCaptionsDialog::track_selected, this)); + + SetSizerAndFit (sizer); +} + +void +ClosedCaptionsDialog::track_selected () +{ + _current = optional (); + _viewer->slow_refresh (); + update (_last_update); } void ClosedCaptionsDialog::paint () { - wxPaintDC dc (this); + wxPaintDC dc (_display); dc.SetBackground (*wxBLACK_BRUSH); dc.Clear (); dc.SetTextForeground (*wxWHITE); @@ -100,40 +133,98 @@ private: void ClosedCaptionsDialog::update (DCPTime time) { - shared_ptr player = _player.lock (); - DCPOMATIC_ASSERT (player); - list to_show; - BOOST_FOREACH (PlayerText i, player->closed_captions_for_frame(time)) { - BOOST_FOREACH (StringText j, i.text) { - to_show.push_back (j); - } + _last_update = time; + + if (_current_in_lines && _current && _current->period.to > time) { + /* Current one is fine */ + return; } - for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) { - _lines[j] = ""; + if (_current && _current->period.to < time) { + /* Current one has finished; clear out */ + for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) { + _lines[j] = ""; + } + Refresh (); + _current = optional(); } - to_show.sort (ClosedCaptionSorter()); + if (!_current && !_tracks.empty()) { + /* We have no current one: get another */ + shared_ptr butler = _butler.lock (); + DCPOMATIC_ASSERT (butler); + DCPOMATIC_ASSERT (_track->GetSelection() >= 0); + DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size())); + DCPTextTrack track = _tracks[_track->GetSelection()]; + while (true) { + optional d = butler->get_closed_caption (); + if (!d) { + break; + } + if (d->track == track) { + _current = d; + break; + } + } - list::const_iterator j = to_show.begin(); - int k = 0; - while (j != to_show.end() && k < CLOSED_CAPTION_LINES) { - _lines[k] = j->text(); - ++j; - ++k; + _current_in_lines = false; } - Refresh (); + if (_current && _current->period.contains(time)) { + /* We need to set this new one up */ + + list to_show = _current->text.string; + + for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) { + _lines[j] = ""; + } + + to_show.sort (ClosedCaptionSorter()); + + list::const_iterator j = to_show.begin(); + int k = 0; + while (j != to_show.end() && k < CLOSED_CAPTION_LINES) { + _lines[k] = j->text(); + ++j; + ++k; + } + + Refresh (); + _current_in_lines = true; + } } void ClosedCaptionsDialog::clear () { + _current = optional(); + _current_in_lines = false; Refresh (); } void -ClosedCaptionsDialog::set_player (weak_ptr player) +ClosedCaptionsDialog::set_film_and_butler (shared_ptr film, weak_ptr butler) { - _player = player; + _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()) { + if (find(_tracks.begin(), _tracks.end(), j->dcp_track()) == _tracks.end()) { + _tracks.push_back (*j->dcp_track()); + } + } + } + } + + _track->Clear (); + BOOST_FOREACH (DCPTextTrack const & i, _tracks) { + _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language))); + } + + if (_track->GetCount() > 0) { + _track->SetSelection (0); + } + + _butler = butler; }