wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
- add_label_to_sizer (track_sizer, this, _("Track"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ 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);
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);
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 */
if (!_current && !_tracks.empty()) {
/* We have no current one: get another */
- shared_ptr<Butler> 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<TextRingBuffers::Data> d = butler->get_closed_caption ();
if (_current && _current->period.contains(time)) {
/* We need to set this new one up */
- list<StringText> to_show = _current->text.string;
+ auto to_show = _current->text.string;
for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
_lines[j] = "";
to_show.sort (ClosedCaptionSorter());
- list<StringText>::const_iterator j = to_show.begin();
+ auto j = to_show.begin();
int k = 0;
while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) {
- _lines[k] = j->text();
+ _lines[k] = std_to_wx (j->text());
++j;
++k;
}
for (auto i: film->content()) {
for (auto j: i->text) {
- if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) {
+ 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());
}
_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) {