Improve error messages on failing to load DCP subs.

[dcpomatic.git] / src / lib / dcp_subtitle.cc

diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc
index b0e114be2cda2ca72959bcad66d7f1416e88fcc7..f9aa7e0d9f103da6f38d54f5e35621c23c3b6731 100644 (file)
--- 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 <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 
 #include "i18n.h"
 
+using std::string;
+using std::exception;
 using boost::shared_ptr;
 
 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 (...) {
-
+       } 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;