X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_sound_asset.h;h=2fb01c8d110c06a6c06c87a9fb7a5d07794babf1;hb=201b6fdf572c04424d870ac4d07d1d1a8725b24c;hp=3158f8a06891b9c2ba8da665397e61619da9d243;hpb=ff896d5f5ec20e1371b423bb746c32fa55cc126a;p=libdcp.git

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 3158f8a0..2fb01c8d 100644
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014-2015 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.h
@@ -36,23 +50,23 @@ 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;
 
 	/** @return the SoundAsset that this object refers to */
 	boost::shared_ptr<SoundAsset> asset () {
-		return boost::dynamic_pointer_cast<SoundAsset> (_asset_ref.asset ());
+		return asset_of_type<SoundAsset> ();
 	}
 
 	/** @return the SoundAsset that this object refers to */
 	boost::shared_ptr<const SoundAsset> asset () const {
-		return boost::dynamic_pointer_cast<const SoundAsset> (_asset_ref.asset ());
+		return asset_of_type<const SoundAsset> ();
 	}
 
 private:
 	std::string key_type () const;
-	std::string cpl_node_name () const;
+	std::string cpl_node_name (Standard standard) const;
 };
 
 }