Refactor: move some layout code to its own file in lib.

3 files changed, 88 insertions, 0 deletions

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 <cth@carlh.net>
+
+    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 <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "dcpomatic_assert.h"
+#include "layout_closed_captions.h"
+#include "string_text.h"
+
+
+using std::string;
+using std::vector;
+
+
+vector<string>
+layout_closed_captions(vector<StringText> 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<string> 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 <cth@carlh.net>
+
+    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 <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include <string>
+#include <vector>
+
+
+class StringText;
+
+
+std::vector<std::string> layout_closed_captions(std::vector<StringText> 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