X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_atmos_asset.cc;h=32ebbcf53d12eb376b5f1d3e99909cfdca42a476;hb=2fa5b7bfeb3826c20f2fe80f272b556d61935063;hp=8726b39c68dc0cb532112a0a62582e930d23d5c4;hpb=f40c9704ce44234558bba1ad15de42a50475f1e3;p=libdcp.git

diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index 8726b39c..32ebbcf5 100644
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,58 +31,85 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_atmos_asset.cc
- *  @brief ReelAtmosAsset class.
+ *  @brief ReelAtmosAsset class
  */
 
+
 #include "atmos_asset.h"
 #include "reel_atmos_asset.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 
+
 using std::string;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
-ReelAtmosAsset::ReelAtmosAsset (boost::shared_ptr<AtmosAsset> asset, int64_t entry_point)
-	: ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+
+ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<AtmosAsset> asset, int64_t entry_point)
+	: ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+	, ReelFileAsset (asset)
+	, ReelEncryptableAsset (asset->key_id())
 {
 
 }
 
-ReelAtmosAsset::ReelAtmosAsset (boost::shared_ptr<const cxml::Node> node)
+
+ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
 	: ReelAsset (node)
+	, ReelFileAsset (node)
+	, ReelEncryptableAsset (node)
 {
 	node->ignore_child ("DataType");
 	node->done ();
 }
 
+
 string
-ReelAtmosAsset::cpl_node_name () const
+ReelAtmosAsset::cpl_node_name (Standard) const
 {
 	return "axd:AuxData";
 }
 
+
 pair<string, string>
 ReelAtmosAsset::cpl_node_namespace () const
 {
-	return make_pair ("http://www.dolby.com/schemas/2012/AD", "axd");
+	return { "http://www.dolby.com/schemas/2012/AD", "axd" };
 }
 
+
 string
 ReelAtmosAsset::key_type () const
 {
 	return "MDEK";
 }
 
-void
+
+xmlpp::Node *
 ReelAtmosAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	ReelAsset::write_to_cpl (node, standard);
+	auto asset = write_to_cpl_asset (node, standard, hash());
+	write_to_cpl_encryptable (asset);
+	asset->add_child("axd:DataType")->add_child_text("urn:smpte:ul:060e2b34.04010105.0e090604.00000000");
+	return asset;
+}
+
+
+bool
+ReelAtmosAsset::equals (shared_ptr<const ReelAtmosAsset> other, EqualityOptions opt, NoteHandler note) const
+{
+	if (!asset_equals (other, opt, note)) {
+		return false;
+	}
+
+	if (!file_asset_equals (other, opt, note)) {
+		return false;
+	}
 
-	/* Find <axd:AuxData> */
-	xmlpp::Node* mp = find_child (node, cpl_node_name ());
-	mp->add_child("axd:DataType")->add_child_text ("urn:smpte:ul:060e2b34.04010105.0e090604.00000000");
+	return true;
 }