X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=afcf5fa876f97b35d0cf66bf9765cf379e0afa13;hb=0802245c4c89b9a8557e5f9b238e8317a92ba51d;hp=3f444f9a4b14b5605fa9e51e41bb532ca093860a;hpb=558f81527d1305b6b5c47de947837fb6799d3345;p=dcpomatic.git diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index 3f444f9a4..afcf5fa87 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,8 +19,12 @@ */ #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; @@ -31,29 +35,67 @@ using std::make_pair; using boost::shared_ptr; using boost::weak_ptr; using boost::optional; +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)); + + 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); + + 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); @@ -102,34 +144,49 @@ private: }; void -ClosedCaptionsDialog::update (DCPTime time) +ClosedCaptionsDialog::update () { - if (_current_in_lines && _current->second.to > time) { + DCPTime const time = _viewer->time (); + + if (_current_in_lines && _current && _current->period.to > time) { /* Current one is fine */ return; } - if (_current && _current->second.to < time) { + 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 >(); + _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 (); + 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; + } + } + _current_in_lines = false; } - if (_current && _current->second.contains(time)) { + if (_current && _current->period.contains(time)) { /* We need to set this new one up */ - list to_show = _current->first.string; + list to_show = _current->text.string; for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) { _lines[j] = ""; @@ -153,13 +210,34 @@ ClosedCaptionsDialog::update (DCPTime time) void ClosedCaptionsDialog::clear () { - _current = optional >(); + _current = optional(); _current_in_lines = false; Refresh (); } void -ClosedCaptionsDialog::set_butler (weak_ptr butler) +ClosedCaptionsDialog::set_film_and_butler (shared_ptr film, weak_ptr butler) { + _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; }