From cb6729aa79b555b219974207fbe2ff0510f9d3ea Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 20 Jan 2021 23:42:28 +0100
Subject: Bump libdcp for better verification, and make API adjustments.

---
 src/lib/dcp_decoder.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 71eb0bae0..4bc090bf4 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -280,7 +280,7 @@ DCPDecoder::pass_texts (
 	int64_t const frame = next.frames_round (vfr);
 
 	if (_decode_referenced || !reference) {
-		list<shared_ptr<dcp::Subtitle> > subs = asset->subtitles_during (
+		auto subs = asset->subtitles_during (
 			dcp::Time (entry_point + frame, vfr, vfr),
 			dcp::Time (entry_point + frame + 1, vfr, vfr),
 			true
@@ -289,10 +289,10 @@ DCPDecoder::pass_texts (
 		list<dcp::SubtitleString> strings;
 
 		for (auto i: subs) {
-			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+			auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
 			if (is) {
 				if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
-					dcp::SubtitleString b = strings.back();
+					auto b = strings.back();
 					decoder->emit_plain (
 						ContentTimePeriod (
 							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -310,7 +310,7 @@ DCPDecoder::pass_texts (
 			   this would need to be done both here and in DCPSubtitleDecoder.
 			*/
 
-			shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage> (i);
+			auto ii = dynamic_pointer_cast<const dcp::SubtitleImage>(i);
 			if (ii) {
 				emit_subtitle_image (
 					ContentTimePeriod (
@@ -325,7 +325,7 @@ DCPDecoder::pass_texts (
 		}
 
 		if (!strings.empty()) {
-			dcp::SubtitleString b = strings.back();
+			auto b = strings.back();
 			decoder->emit_plain (
 				ContentTimePeriod (
 					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
-- 
cgit v1.2.3