From cbd4450197a083bf58bda510e626f73ba583cb66 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 21 Jul 2018 15:16:18 +0100
Subject: Basics of multiple captions per content so that DCPContent can hold
 subs and closed captions.

---
 src/lib/dcp_subtitle_decoder.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index c7a9a863f..3ed4a6827 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -39,7 +39,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
 	if (_next != _subtitles.end()) {
 		first = content_time_period(*_next).from;
 	}
-	caption.reset (new CaptionDecoder (this, content->caption, log, first));
+	caption.push_back (shared_ptr<CaptionDecoder> (new CaptionDecoder (this, content->only_caption(), log, first)));
 }
 
 void
@@ -81,7 +81,7 @@ DCPSubtitleDecoder::pass ()
 		/* XXX: image subtitles */
 	}
 
-	caption->emit_plain (p, s);
+	only_caption()->emit_plain (p, s);
 	return false;
 }
 
-- 
cgit v1.2.3