X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=024d62f3424f3138f2f84f190e5f99119d4a8984;hp=16a738a5135eedc5407e55f6185554faefc14d1a;hb=39fb8198febde1937019db1c300ec363aab5aa56;hpb=ddcd4f3ba0af3e9d49dbb68127317cd0d871a248

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 16a738a51..024d62f34 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,26 +18,30 @@
 
 */
 
+
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
 #include <iostream>
 
+
 using std::cout;
 using std::list;
 using std::map;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::make_shared;
 using boost::bind;
 using namespace dcpomatic;
 
+
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
 	: Decoder (film)
 {
-	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+	auto c = load (content->path(0));
 	c->fix_empty_font_ids ();
 	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
@@ -46,33 +50,35 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
 	if (_next != _subtitles.end()) {
 		first = content_time_period(*_next).from;
 	}
-	text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
+	text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
 
-	map<string, dcp::ArrayData> fm = c->font_data();
-	for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
-		_fonts.push_back (FontData(j->first, j->second));
+	auto fm = c->font_data();
+	for (auto const& i: fm) {
+		_fonts.push_back (FontData(i.first, i.second));
 	}
 
 	/* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
-	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, c->load_font_nodes()) {
+	for (auto i: c->load_font_nodes()) {
 		if (fm.find(i->id) == fm.end()) {
 			_fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
 		}
 	}
 }
 
+
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
 	Decoder::seek (time, accurate);
 
 	_next = _subtitles.begin ();
-	list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+	auto i = _subtitles.begin ();
 	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
 		++i;
 	}
 }
 
+
 bool
 DCPSubtitleDecoder::pass ()
 {
@@ -89,10 +95,10 @@ DCPSubtitleDecoder::pass ()
 
 	list<dcp::SubtitleString> s;
 	list<dcp::SubtitleImage> i;
-	ContentTimePeriod const p = content_time_period (*_next);
+	auto const p = content_time_period (*_next);
 
 	while (_next != _subtitles.end () && content_time_period (*_next) == p) {
-		shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+		auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
 		if (ns) {
 			s.push_back (*ns);
 			++_next;
@@ -101,7 +107,7 @@ DCPSubtitleDecoder::pass ()
 			   this would need to be done both here and in DCPDecoder.
 			*/
 
-			shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+			auto ni = dynamic_pointer_cast<const dcp::SubtitleImage>(*_next);
 			if (ni) {
 				emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
 				++_next;
@@ -113,13 +119,14 @@ DCPSubtitleDecoder::pass ()
 	return false;
 }
 
+
 ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
 {
-	return ContentTimePeriod (
-		ContentTime::from_seconds (s->in().as_seconds ()),
-		ContentTime::from_seconds (s->out().as_seconds ())
-		);
+	return {
+		ContentTime::from_seconds(s->in().as_seconds()),
+		ContentTime::from_seconds(s->out().as_seconds())
+	};
 }