From 4edfd9afa0fdfea1fa6d86409e5696d90a580018 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Dec 2025 00:39:48 +0100 Subject: Refactor: move some layout code to its own file in lib. --- src/lib/layout_closed_captions.cc | 58 +++++++++++++++++++++++++++++++++++++++ src/lib/layout_closed_captions.h | 29 ++++++++++++++++++++ src/lib/wscript | 1 + src/wx/closed_captions_dialog.cc | 30 ++------------------ 4 files changed, 91 insertions(+), 27 deletions(-) create mode 100644 src/lib/layout_closed_captions.cc create mode 100644 src/lib/layout_closed_captions.h diff --git a/src/lib/layout_closed_captions.cc b/src/lib/layout_closed_captions.cc new file mode 100644 index 000000000..0f55f79f5 --- /dev/null +++ b/src/lib/layout_closed_captions.cc @@ -0,0 +1,58 @@ +/* + Copyright (C) 2025 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include "dcpomatic_assert.h" +#include "layout_closed_captions.h" +#include "string_text.h" + + +using std::string; +using std::vector; + + +vector +layout_closed_captions(vector text) +{ + auto from_top = [](StringText const & c) + { + switch (c.v_align()) { + case dcp::VAlign::TOP: + return c.v_position(); + case dcp::VAlign::CENTER: + return c.v_position() + 0.5f; + case dcp::VAlign::BOTTOM: + return 1.0f - c.v_position(); + } + DCPOMATIC_ASSERT(false); + return 0.f; + }; + + std::sort(text.begin(), text.end(), [&](StringText const & a, StringText const & b) { return from_top(a) < from_top(b); }); + + vector strings; + for (auto const& t: text) { + strings.push_back(t.text()); + } + + return strings; +} + + diff --git a/src/lib/layout_closed_captions.h b/src/lib/layout_closed_captions.h new file mode 100644 index 000000000..eb8c6d142 --- /dev/null +++ b/src/lib/layout_closed_captions.h @@ -0,0 +1,29 @@ +/* + Copyright (C) 2025 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include +#include + + +class StringText; + + +std::vector layout_closed_captions(std::vector text); diff --git a/src/lib/wscript b/src/lib/wscript index a6a6d96fc..8e4b4d783 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -158,6 +158,7 @@ sources = """ kdm_recipient.cc kdm_with_metadata.cc kdm_util.cc + layout_closed_captions.cc layout_markers.cc log.cc log_entry.cc diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index 7ff720546..3989a2f49 100644 --- a/src/wx/closed_captions_dialog.cc +++ b/src/wx/closed_captions_dialog.cc @@ -25,6 +25,7 @@ #include "lib/butler.h" #include "lib/constants.h" #include "lib/film.h" +#include "lib/layout_closed_captions.h" #include "lib/string_text.h" #include "lib/text_content.h" #include @@ -126,29 +127,6 @@ ClosedCaptionsDialog::paint() } } -class ClosedCaptionSorter -{ -public: - bool operator()(StringText const & a, StringText const & b) - { - return from_top(a) < from_top(b); - } - -private: - float from_top(StringText const & c) const - { - switch (c.v_align()) { - case dcp::VAlign::TOP: - return c.v_position(); - case dcp::VAlign::CENTER: - return c.v_position() + 0.5; - case dcp::VAlign::BOTTOM: - return 1.0 - c.v_position(); - } - DCPOMATIC_ASSERT(false); - return 0; - } -}; void ClosedCaptionsDialog::update() @@ -194,18 +172,16 @@ ClosedCaptionsDialog::update() if (_current && _current->period.contains(time)) { /* We need to set this new one up */ - auto to_show = _current->text.string; - for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) { _lines[j] = wxString{}; } - std::sort(to_show.begin(), to_show.end(), ClosedCaptionSorter()); + auto to_show = layout_closed_captions(_current->text.string); auto j = to_show.begin(); int k = 0; while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) { - _lines[k] = std_to_wx(j->text()); + _lines[k] = std_to_wx(*j); ++j; ++k; } -- cgit v1.2.3