X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_sound_asset.cc;h=25259f427c6c596d6e974857826a05e2b9871907;hb=7c2dccaa6cfbda041fd1a10a391aab5b184b6267;hp=178b0a08ed72062e90ec548b9d2b595917356d35;hpb=926aff7db1e5ad6c02743608e3792fdca39eea4a;p=libdcp.git

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 178b0a08..25259f42 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -45,8 +45,8 @@ using boost::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,29 @@ 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);
+	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
 
         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* hash = find_child (asset, "Hash");
+		asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
         }
+
+	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;
 }