X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_sound_asset.h;h=57d14bc6ed54a652915e52274e8a39ba76e96c19;hb=56286bed00c2a6ad372b6c9d4902c74fd086f384;hp=f091b1b78e747143e8dac906b6e69973964f2e02;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index f091b1b7..57d14bc6 100644
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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.h
@@ -36,9 +50,10 @@ class ReelSoundAsset : public ReelAsset, public ReelMXF
 {
 public:
 	ReelSoundAsset (boost::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
-	ReelSoundAsset (boost::shared_ptr<const cxml::Node>);
+	explicit ReelSoundAsset (boost::shared_ptr<const cxml::Node>);
 
-	void write_to_cpl (xmlpp::Node* node, Standard standard) const;
+	xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
+	bool equals (boost::shared_ptr<const ReelSoundAsset>, EqualityOptions, NoteHandler) const;
 
 	/** @return the SoundAsset that this object refers to */
 	boost::shared_ptr<SoundAsset> asset () {
@@ -52,7 +67,7 @@ public:
 
 private:
 	std::string key_type () const;
-	std::string cpl_node_name () const;
+	std::string cpl_node_name (Standard standard) const;
 };
 
 }