Support subtitles in imported DCPs. Bump libdcp to get support

for importing encrypted subtitles.

3 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b9fe4214..240ec1de7 100644
--- 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 bb0848f76..0f1f33b16 100644
--- 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 d82f9c028..3db50104f 100644
--- 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;