From 7d66bda50ade8ea618f331b885f1bfa4fa0a2af9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 11 Apr 2021 20:49:44 +0200
Subject: Split ReelSubtitleAsset into Interop and SMPTE classes.

---
 src/cpl.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/cpl.cc')

diff --git a/src/cpl.cc b/src/cpl.cc
index 39e78baa..3b549757 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -137,7 +137,10 @@ CPL::CPL (boost::filesystem::path file)
 			_ratings.push_back (Rating(i));
 		}
 	}
-	_reels = type_grand_children<Reel> (f, "ReelList", "Reel");
+
+	for (auto i: f.node_child("ReelList")->node_children("Reel")) {
+		_reels.push_back (make_shared<Reel>(i, *_standard));
+	}
 
 	auto reel_list = f.node_child ("ReelList");
 	if (reel_list) {
@@ -546,7 +549,9 @@ add_encryptable_assets (vector<shared_ptr<T>>& assets, vector<shared_ptr<Reel>>
 			assets.push_back (i->main_sound());
 		}
 		if (i->main_subtitle ()) {
-			assets.push_back (i->main_subtitle());
+			if (auto enc = dynamic_pointer_cast<ReelEncryptableAsset>(i->main_subtitle())) {
+				assets.push_back (enc);
+			}
 		}
 		for (auto j: i->closed_captions()) {
 			assets.push_back (j);
-- 
cgit v1.2.3