X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle.cc;h=f9aa7e0d9f103da6f38d54f5e35621c23c3b6731;hb=05f2028ec1280a98050dc22609879230337a35ef;hp=b0e114be2cda2ca72959bcad66d7f1416e88fcc7;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc index b0e114be2..f9aa7e0d9 100644 --- a/src/lib/dcp_subtitle.cc +++ b/src/lib/dcp_subtitle.cc @@ -20,34 +20,39 @@ #include "dcp_subtitle.h" #include "exceptions.h" +#include "compose.hpp" #include #include #include "i18n.h" +using std::string; +using std::exception; using boost::shared_ptr; shared_ptr DCPSubtitle::load (boost::filesystem::path file) const { shared_ptr sc; + string interop_error; + string smpte_error; try { sc.reset (new dcp::InteropSubtitleAsset (file)); - } catch (...) { - + } catch (exception& e) { + interop_error = e.what (); } if (!sc) { try { sc.reset (new dcp::SMPTESubtitleAsset (file)); - } catch (...) { - + } 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;