summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-03 21:42:48 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-03 21:42:48 +0000
commit64a3d353037ac8285b27237ae0bd16c6c14ca17a (patch)
treecd740d0a67601c42bc6415473d3baedc39db46e5 /src
parent3c6a628ebd9699dcf760ed98df83c1a3c267bfb4 (diff)
Missing KeyId.
Diffstat (limited to 'src')
-rw-r--r--src/picture_asset.cc3
-rw-r--r--src/sound_asset.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index e7cb8757..295afc15 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -66,6 +66,9 @@ PictureAsset::write_to_cpl (xmlpp::Element* parent) const
main_picture->add_child("IntrinsicDuration")->add_child_text(boost::lexical_cast<string> (_length));
main_picture->add_child("EntryPoint")->add_child_text("0");
main_picture->add_child("Duration")->add_child_text(boost::lexical_cast<string> (_length));
+ if (_encrypted) {
+ main_picture->add_child("KeyId")->add_child_text("urn:uuid:" + _key_id);
+ }
main_picture->add_child("FrameRate")->add_child_text(boost::lexical_cast<string> (_fps) + " 1");
stringstream sar;
sar << _width << " " << _height;
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 6ab7f031..b71d218f 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -201,6 +201,9 @@ SoundAsset::write_to_cpl (xmlpp::Element* parent) const
main_sound->add_child("IntrinsicDuration")->add_child_text(boost::lexical_cast<string> (_length));
main_sound->add_child("EntryPoint")->add_child_text("0");
main_sound->add_child("Duration")->add_child_text(boost::lexical_cast<string> (_length));
+ if (_encrypted) {
+ main_sound->add_child("KeyId")->add_child_text("urn:uuid:" + _key_id);
+ }
}
bool