summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-04 01:14:12 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-04 01:14:12 +0100
commit41c4d628f7ef3c9f9b434d34ff099f5fe4de1ae4 (patch)
treef912e10cfd99245933ffd3eaa0d39a01aec1daad /src/dcp.cc
parent09e16aa3acf7878b54a4995a0be79890f26db09f (diff)
Port support for MXF-wrapped subtitles from 0.x
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 044e1f53..9374bffd 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -133,7 +133,7 @@ DCP::read (bool keep_going, ReadErrors* errors)
if (root == "CompositionPlaylist") {
_assets.push_back (shared_ptr<CPL> (new CPL (path)));
} else if (root == "DCSubtitle") {
- _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path)));
+ _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path, false)));
}
} else if (boost::algorithm::ends_with (path.string(), ".mxf")) {
ASDCP::EssenceType_t type;
@@ -154,6 +154,9 @@ DCP::read (bool keep_going, ReadErrors* errors)
case ASDCP::ESS_JPEG_2000_S:
_assets.push_back (shared_ptr<StereoPictureMXF> (new StereoPictureMXF (path)));
break;
+ case ASDCP::ESS_TIMED_TEXT:
+ _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path, true)));
+ break;
default:
throw DCPReadError ("Unknown MXF essence type");
}