X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle.cc;h=c2c3f7f70a6c4215955c82c963090d8ab1a5b8b2;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=6f579b2d3600aee9a05b039791220a748609409f;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc
index 6f579b2d3..c2c3f7f70 100644
--- a/src/lib/dcp_subtitle.cc
+++ b/src/lib/dcp_subtitle.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,22 @@
 
 */
 
+
 #include "dcp_subtitle.h"
 #include "exceptions.h"
 #include "compose.hpp"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
+#include <memory>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::exception;
 using std::shared_ptr;
+using std::string;
+using std::make_shared;
+
 
 shared_ptr<dcp::SubtitleAsset>
 DCPSubtitle::load (boost::filesystem::path file) const
@@ -38,21 +43,21 @@ DCPSubtitle::load (boost::filesystem::path file) const
 	string smpte_error;
 
 	try {
-		sc.reset (new dcp::InteropSubtitleAsset (file));
+		sc = make_shared<dcp::InteropSubtitleAsset>(file);
 	} catch (exception& e) {
 		interop_error = e.what ();
 	}
 
 	if (!sc) {
 		try {
-			sc.reset (new dcp::SMPTESubtitleAsset (file));
+			sc = make_shared<dcp::SMPTESubtitleAsset>(file);
 		} catch (exception& e) {
 			smpte_error = e.what();
 		}
 	}
 
 	if (!sc) {
-		throw FileError (String::compose (_("Could not read subtitles (%1 / %2)"), interop_error, smpte_error), file);
+		throw FileError(String::compose(_("Could not read subtitles (%1 / %2)"), interop_error, smpte_error), file);
 	}
 
 	return sc;