summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-14 23:59:43 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-14 23:59:43 +0100
commita46dc9818f2d244023fbc0a8362db7203ff610ce (patch)
tree6a75bb2f13c4a7fd4093af94c6daabc0bb236b1b /src
parentaa0d6076650e40a390051d426b25c5b373fe0785 (diff)
Support subtitles in imported DCPs. Bump libdcp to get support
for importing encrypted subtitles.
Diffstat (limited to 'src')
-rw-r--r--src/wx/subtitle_panel.cc3
1 files changed, 2 insertions, 1 deletions
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;