From f3ab77e34a41ad4d8f5156e9d6598314975b9565 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 6 Aug 2024 23:57:22 +0200
Subject: Adapt to some libdcp class renaming to allow open captions/closed
 subtitles.

---
 src/lib/map_cli.cc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/lib/map_cli.cc')

diff --git a/src/lib/map_cli.cc b/src/lib/map_cli.cc
index be3841deb..149e09fbc 100644
--- a/src/lib/map_cli.cc
+++ b/src/lib/map_cli.cc
@@ -24,18 +24,17 @@
 #include "util.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/interop_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
 #include <dcp/filesystem.h>
 #include <dcp/font_asset.h>
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
-#include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_file_asset.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
-#include <dcp/reel_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/reel_text_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/optional.hpp>
@@ -292,16 +291,16 @@ map_cli(int argc, char* argv[], std::function<void (string)> out)
 		}
 	};
 
-	auto maybe_copy_font_and_images = [&maybe_copy, output_dir, copy](shared_ptr<const dcp::SubtitleAsset> asset, bool rename, bool hard_link, bool soft_link) {
-		auto interop = dynamic_pointer_cast<const dcp::InteropSubtitleAsset>(asset);
+	auto maybe_copy_font_and_images = [&maybe_copy, output_dir, copy](shared_ptr<const dcp::TextAsset> asset, bool rename, bool hard_link, bool soft_link) {
+		auto interop = dynamic_pointer_cast<const dcp::InteropTextAsset>(asset);
 		boost::optional<boost::filesystem::path> extra;
 		if (interop) {
 			extra = interop->id();
 			for (auto font_asset: interop->font_assets()) {
 				maybe_copy(font_asset->id(), rename, hard_link, soft_link, extra);
 			}
-			for (auto subtitle: interop->subtitles()) {
-				if (auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subtitle)) {
+			for (auto subtitle: interop->texts()) {
+				if (auto image = dynamic_pointer_cast<const dcp::TextImage>(subtitle)) {
 					auto const output_path = *output_dir / asset->id() / image->file()->filename();
 					copy(*image->file(), output_path, hard_link, soft_link);
 				}
-- 
cgit v1.2.3