Support subtitles in imported DCPs. Bump libdcp to get support

for importing encrypted subtitles.

diff --git a/ChangeLog b/ChangeLog
index 7b9fe421402cb4466d9d5fc219237f9290e74820..240ec1de737f28bd52d6907a10d506ca1f7461f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-08-14  Carl Hetherington  <cth@carlh.net>
 
+       * Support subtitles in imported DCPs.
+
        * Updated zh_CN translation from 刘汉源.
 
 2016-08-09  Carl Hetherington  <cth@carlh.net>

diff --git a/cscript b/cscript
index bb0848f761c0700b0345246fec6520616d8a52f0..0f1f33b16abc9710bbb60cfb46d4821bac152d14 100644 (file)
--- a/cscript
+++ b/cscript
@@ -237,7 +237,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '563dbf0'),
+            ('libdcp', '846bb29'),
             ('libsub', '067c21c'))
 
 def configure_options(target):

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index d82f9c028d7388af412e9956d3be68bea714b3b2..3db50104f426c420c415ad3533fcbaaa0bf1137e 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -256,6 +256,7 @@ SubtitlePanel::setup_sensitivity ()
                /* These are the content types that could include subtitles */
                shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i);
                shared_ptr<const TextSubtitleContent> sc = boost::dynamic_pointer_cast<const TextSubtitleContent> (i);
+               shared_ptr<const DCPContent> dc = boost::dynamic_pointer_cast<const DCPContent> (i);
                shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (i);
                if (fc) {
                        if (fc->subtitle) {
@@ -269,7 +270,7 @@ SubtitlePanel::setup_sensitivity ()
                                ++ffmpeg_subs;
                                ++any_subs;
                        }
-               } else if (sc || dsc) {
+               } else if (sc || dc || dsc) {
                        /* XXX: in the future there could be bitmap subs from DCPs */
                        ++text_subs;
                        ++any_subs;