Bv2.1 8.6.3: <ExtensionMetadata> must be present and have precise contents.

[libdcp.git] / src / reel_sound_asset.cc

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 178b0a08ed72062e90ec548b9d2b595917356d35..520959990bbe49965a2a8e16fd94ef7e3ff886d1 100644 (file)
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -41,12 +41,12 @@
 #include <libxml++/libxml++.h>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
 ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point)
-       : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
-       , ReelMXF (asset->key_id())
+       : ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+       , ReelMXF (asset, asset->key_id())
 {
 
 }
@@ -71,16 +71,23 @@ ReelSoundAsset::key_type () const
        return "MDAK";
 }
 
-void
+xmlpp::Node *
 ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       ReelAsset::write_to_cpl (node, standard);
-
-        if (key_id ()) {
-               /* Find <MainSound> */
-               xmlpp::Node* ms = find_child (node, cpl_node_name (standard));
-               /* Find <Hash> */
-               xmlpp::Node* hash = find_child (ms, "Hash");
-               ms->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id().get ());
-        }
+       xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
+       write_to_cpl_mxf (asset);
+       return asset;
+}
+
+bool
+ReelSoundAsset::equals (shared_ptr<const ReelSoundAsset> other, EqualityOptions opt, NoteHandler note) const
+{
+       if (!asset_equals (other, opt, note)) {
+               return false;
+       }
+       if (!mxf_equals (other, opt, note)) {
+               return false;
+       }
+
+       return true;
 }