Cleanup: pass EqualityOptions as const&

[libdcp.git] / src / reel_atmos_asset.cc

diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index bd354bf79f91f9d24374ab3007987658c6526c17..ef39a4eb91cc3c6597df93cb81cce778c44261fd 100644 (file)
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -39,8 +39,11 @@
 
 #include "atmos_asset.h"
 #include "reel_atmos_asset.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
@@ -51,18 +54,14 @@ using namespace dcp;
 
 
 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())
+       : ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 {
 
 }
 
 
 ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
-       : ReelAsset (node)
-       , ReelFileAsset (node)
-       , ReelEncryptableAsset (node)
+       : ReelFileAsset (node)
 {
        node->ignore_child ("DataType");
        node->done ();
@@ -77,31 +76,23 @@ ReelAtmosAsset::cpl_node_name (Standard) const
 
 
 pair<string, string>
-ReelAtmosAsset::cpl_node_namespace (Standard) const
+ReelAtmosAsset::cpl_node_namespace () const
 {
        return { "http://www.dolby.com/schemas/2012/AD", "axd" };
 }
 
 
-string
-ReelAtmosAsset::key_type () const
-{
-       return "MDEK";
-}
-
-
 xmlpp::Node *
 ReelAtmosAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       auto asset = write_to_cpl_asset (node, standard, hash());
-       write_to_cpl_encryptable (asset);
+       auto asset = ReelFileAsset::write_to_cpl (node, standard);
        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
+ReelAtmosAsset::equals(shared_ptr<const ReelAtmosAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!asset_equals (other, opt, note)) {
                return false;