Missing KeyId.
authorCarl Hetherington <cth@carlh.net>
Thu, 3 Jan 2013 21:42:48 +0000 (21:42 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 3 Jan 2013 21:42:48 +0000 (21:42 +0000)
src/picture_asset.cc
src/sound_asset.cc

index e7cb87575b40ef8ec9964273acea8a1fd9ef7a87..295afc153335c8e319072f0dddb6b3e61cc57084 100644 (file)
@@ -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;
index 6ab7f03164cc1ae94d9be0a0d2903a75325e4615..b71d218f8a0308d9f60a08c3d2c6357d98df2be3 100644 (file)
@@ -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