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

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index d3cc41d1..e944467f 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -45,20 +45,19 @@
 
 using std::string;
 using std::shared_ptr;
+using boost::optional;
 using namespace dcp;
 
 
 ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point)
-	: ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
-	, ReelMXF (asset, asset->key_id())
+	: ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 {
 
 }
 
 
 ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
-	: ReelAsset (node)
-	, ReelMXF (node)
+	: ReelFileAsset (node)
 {
 	node->ignore_child ("Language");
 	node->done ();
@@ -72,19 +71,10 @@ ReelSoundAsset::cpl_node_name (Standard) const
 }
 
 
-string
+optional<string>
 ReelSoundAsset::key_type () const
 {
-	return "MDAK";
-}
-
-
-xmlpp::Node *
-ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
-{
-	auto asset = write_to_cpl_asset (node, standard, hash());
-	write_to_cpl_mxf (asset);
-	return asset;
+	return string("MDAK");
 }
 
 
@@ -94,7 +84,7 @@ ReelSoundAsset::equals (shared_ptr<const ReelSoundAsset> other, EqualityOptions
 	if (!asset_equals (other, opt, note)) {
 		return false;
 	}
-	if (!mxf_equals (other, opt, note)) {
+	if (!file_asset_equals (other, opt, note)) {
 		return false;
 	}