diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
| commit | 2e93ca3670e5581b5523f60130b38594de10d6c3 (patch) | |
| tree | 6ed18ed07bccf77b2d172ef7681fce981956815f /src/asset.cc | |
| parent | 9ed550de7b98ca2f8467dd134a9c0ad7f1868f23 (diff) | |
| parent | 447cc7ddec5ace7bb47df35192ef02e7c19bf9b3 (diff) | |
Merge master; MXF subtitle stuff not included.
Diffstat (limited to 'src/asset.cc')
| -rw-r--r-- | src/asset.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/asset.cc b/src/asset.cc index f8de10b6..aaa79dc7 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -60,7 +60,7 @@ Asset::Asset (string id) } void -Asset::write_to_pkl (xmlpp::Node* node) const +Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const { assert (!_file.empty ()); @@ -69,7 +69,7 @@ Asset::write_to_pkl (xmlpp::Node* node) const asset->add_child("AnnotationText")->add_child_text (_id); asset->add_child("Hash")->add_child_text (hash ()); asset->add_child("Size")->add_child_text (lexical_cast<string> (boost::filesystem::file_size (_file))); - asset->add_child("Type")->add_child_text (pkl_type ()); + asset->add_child("Type")->add_child_text (pkl_type (standard)); } void |