diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-21 16:43:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-21 16:43:38 +0100 |
| commit | 06851d8baa70ddcf0da088fcce24ba24114cc7de (patch) | |
| tree | 4699465da8fcad358051285534599f6235b29c4a /src/parse | |
| parent | faa3e4b50afaab5d6eb9722eb0da7705d3fddf7e (diff) | |
Try to ignore Atmos tracks when loading CPLs.
Diffstat (limited to 'src/parse')
| -rw-r--r-- | src/parse/cpl.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/parse/cpl.cc b/src/parse/cpl.cc index 8184c57b..efa4cac2 100644 --- a/src/parse/cpl.cc +++ b/src/parse/cpl.cc @@ -35,7 +35,7 @@ CPL::CPL (boost::filesystem::path file) { cxml::Document f ("CompositionPlaylist"); f.read_file (file); - + id = f.string_child ("Id"); annotation_text = f.optional_string_child ("AnnotationText").get_value_or (""); issue_date = f.string_child ("IssueDate"); @@ -76,6 +76,9 @@ CPLAssetList::CPLAssetList (shared_ptr<const cxml::Node> node) main_sound = optional_type_child<MainSound> (node, "MainSound"); main_subtitle = optional_type_child<MainSubtitle> (node, "MainSubtitle"); + /* Ignore Atmos metadata */ + node->ignore_child ("axd:AuxData"); + node->done (); } @@ -128,10 +131,10 @@ MainSound::MainSound (shared_ptr<const cxml::Node> node) entry_point = node->number_child<int64_t> ("EntryPoint"); duration = node->number_child<int64_t> ("Duration"); key_id = node->optional_string_child ("KeyId").get_value_or (""); - + node->ignore_child ("Hash"); node->ignore_child ("Language"); - + node->done (); } @@ -146,6 +149,6 @@ MainSubtitle::MainSubtitle (shared_ptr<const cxml::Node> node) node->ignore_child ("Hash"); node->ignore_child ("Language"); - + node->done (); } |
