diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-09-06 21:58:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-09-06 21:58:15 +0100 |
| commit | 0c82e61b2c6177c91a1a80caf6819e36728c004f (patch) | |
| tree | 55bf5c71321bd465c8cfe524d27b11711fcf3b6a /src/reel.cc | |
| parent | 926aff7db1e5ad6c02743608e3792fdca39eea4a (diff) | |
CCAP fixes.
Diffstat (limited to 'src/reel.cc')
| -rw-r--r-- | src/reel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/reel.cc b/src/reel.cc index 1804f3dc..a159ce74 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -49,6 +49,7 @@ #include "reel_atmos_asset.h" #include "reel_closed_caption_asset.h" #include <libxml++/nodes/element.h> +#include <boost/foreach.hpp> using std::string; using std::list; @@ -84,11 +85,10 @@ Reel::Reel (boost::shared_ptr<const cxml::Node> node) } /* XXX: it's not ideal that we silently tolerate Interop or SMPTE nodes here */ - shared_ptr<cxml::Node> closed_caption = asset_list->optional_node_child ("cc-cpl:MainClosedCaption"); - if (closed_caption) { - _closed_caption.reset (new ReelClosedCaptionAsset (closed_caption)); + shared_ptr<cxml::Node> closed_caption = asset_list->optional_node_child ("MainClosedCaption"); + if (!closed_caption) { + closed_caption = asset_list->optional_node_child ("ClosedCaption"); } - closed_caption = asset_list->optional_node_child ("tt:ClosedCaption"); if (closed_caption) { _closed_caption.reset (new ReelClosedCaptionAsset (closed_caption)); } |