X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_sound_asset.cc;h=e944467f130d294fc2216994324fbc2ca6ef709b;hb=488e3d1bd5e6b17d49f6db4df14c64f4b64db89b;hp=9d3e00d76ef5b6926709bc85008a77a41e7daf02;hpb=6c55e8d2c3b0129a19fc40dca344219021ad12ef;p=libdcp.git

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 9d3e00d7..e944467f 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -1,69 +1,92 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_sound_asset.cc
- *  @brief ReelSoundAsset class.
+ *  @brief ReelSoundAsset class
  */
 
+
 #include "reel_sound_asset.h"
 #include "dcp_assert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using boost::optional;
 using namespace dcp;
 
-ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundMXF> asset, int64_t entry_point)
-	: ReelMXFAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+
+ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point)
+	: ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 {
 
 }
 
+
 ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
-	: ReelMXFAsset (node)
+	: ReelFileAsset (node)
 {
 	node->ignore_child ("Language");
 	node->done ();
 }
 
+
 string
-ReelSoundAsset::cpl_node_name () const
+ReelSoundAsset::cpl_node_name (Standard) const
 {
 	return "MainSound";
 }
 
-string
+
+optional<string>
 ReelSoundAsset::key_type () const
 {
-	return "MDAK";
+	return string("MDAK");
 }
 
-void
-ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
+
+bool
+ReelSoundAsset::equals (shared_ptr<const ReelSoundAsset> other, EqualityOptions opt, NoteHandler note) const
 {
-	ReelAsset::write_to_cpl (node, standard);
-
-        if (!key_id ().empty ()) {
-		/* Find <MainSound> */
-		xmlpp::Node* ms = find_child (node, cpl_node_name ());
-		/* Find <Hash> */
-		xmlpp::Node* hash = find_child (ms, "Hash");
-		ms->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id ());
-        }
+	if (!asset_equals (other, opt, note)) {
+		return false;
+	}
+	if (!file_asset_equals (other, opt, note)) {
+		return false;
+	}
+
+	return true;
 }