Missing audio asset decryption.

[libdcp.git] / src / sound_asset.cc

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 45a656462c8ab6e54f6374d8332f5b892199dcba..0d829b75fa022def1177d772dd23be953481a6b5 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -216,19 +216,10 @@ SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata c
        }
 }
 
-void
-SoundAsset::write_to_cpl (xmlpp::Node* node) const
+string
+SoundAsset::cpl_node_name () const
 {
-       xmlpp::Node* ms = node->add_child ("MainSound");
-       ms->add_child ("Id")->add_child_text ("urn:uuid:" + _uuid);
-       ms->add_child ("AnnotationText")->add_child_text (_file_name);
-       ms->add_child ("EditRate")->add_child_text (lexical_cast<string> (_edit_rate) + " 1");
-       ms->add_child ("IntrinsicDuration")->add_child_text (lexical_cast<string> (_intrinsic_duration));
-       ms->add_child ("EntryPoint")->add_child_text (lexical_cast<string> (_entry_point));
-       ms->add_child ("Duration")->add_child_text (lexical_cast<string> (_duration));
-       if (_encrypted) {
-               ms->add_child("KeyId")->add_child_text("urn:uuid:" + _key_id);
-       }
+       return "MainSound";
 }
 
 bool
@@ -309,7 +300,7 @@ shared_ptr<const SoundFrame>
 SoundAsset::get_frame (int n) const
 {
        /* XXX: should add on entry point here? */
-       return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n));
+       return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n, _decryption_context));
 }
 
 shared_ptr<SoundAssetWriter>