Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/ChangeLog b/ChangeLog
index f6f3bc83ac0b64eeac69be18d2d40b33747a18fb..1f230c1341213003a3a1e3b1ed191fad8f910597 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-13  Carl Hetherington  <cth@carlh.net>
+
+       * Give better error messages when subtitles fail to load.
+
 2016-06-13  c.hetherington  <cth@carlh.net>
 
        * Add 3D video frame type for 3D DCP inputs (#806).

diff --git a/cscript b/cscript
index 260c0f2ec5d4f20478e4b28eb7b11239b1c197d7..e65d1f5c133ed67ca045fc98fc1f30948b16858f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -237,7 +237,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
-            ('libdcp', 'd927e9b'),
+            ('libdcp', '8837fe7'),
             ('libsub', '3e299e5'))
 
 def configure_options(target):

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;

diff --git a/src/tools/wscript b/src/tools/wscript
index 20fcdf129aeea256781089b313027d97fe1aa979..76c87598fdaa5b7ca6d3d10933a459eda5cf1257 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -30,7 +30,7 @@ def configure(conf):
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
     uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX '
-    uselib += 'ICU '
+    uselib += 'ICU NETTLE '
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2'

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 3d602c0f0f87b5f316255c483c289caada4ec6aa..ddd685d0c33f2bb789ef1cce5567421c863958a8 100644 (file)
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -43,7 +43,7 @@ static string const xml = "<Content>"
        "<VideoWidth>1280</VideoWidth>"
        "<VideoHeight>720</VideoHeight>"
        "<VideoFrameRate>25</VideoFrameRate>"
-       "<VideoFrameType>0</VideoFrameType>"
+       "<VideoFrameType>2d</VideoFrameType>"
        "<LeftCrop>0</LeftCrop>"
        "<RightCrop>0</RightCrop>"
        "<TopCrop>0</TopCrop>"

diff --git a/test/wscript b/test/wscript
index b7ac654cd5df8a9c44e8e7f7104c34650b1b21fe..771651236d4f5f30afb4587582b23d7d3e71c9f4 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -34,7 +34,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
     obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
-    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE '
     if bld.env.TARGET_WINDOWS:
         obj.uselib += 'WINSOCK2'
     obj.use    = 'libdcpomatic2'