X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle.cc;h=f9aa7e0d9f103da6f38d54f5e35621c23c3b6731;hp=b0e114be2cda2ca72959bcad66d7f1416e88fcc7;hb=HEAD;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc
index b0e114be2..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,36 +18,46 @@
 
 */
 
+
 #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 boost::shared_ptr;
+
+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
 {
 	shared_ptr<dcp::SubtitleAsset> sc;
+	string interop_error;
+	string smpte_error;
 
 	try {
-		sc.reset (new dcp::InteropSubtitleAsset (file));
-	} catch (...) {
-
+		sc = make_shared<dcp::InteropSubtitleAsset>(file);
+	} catch (exception& e) {
+		interop_error = e.what ();
 	}
 
 	if (!sc) {
 		try {
-			sc.reset (new dcp::SMPTESubtitleAsset (file));
-		} catch (...) {
-
+			sc = make_shared<dcp::SMPTESubtitleAsset>(file);
+		} catch (exception& e) {
+			smpte_error = e.what();
 		}
 	}
 
 	if (!sc) {
-		throw FileError (_("Could not read subtitles"), file);
+		throw FileError(String::compose(_("Could not read subtitles (%1 / %2)"), interop_error, smpte_error), file);
 	}
 
 	return sc;