Tidying.

[libdcp.git] / src / reel_atmos_asset.cc

diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index 9dccbbcb6cfdf28e0ee84b080050e93e8a0a9b9c..d9e290a90496e7b97e23e35042204f58d2f8ec74 100644 (file)
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,21 +31,25 @@
     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 std::shared_ptr;
 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)
        , ReelMXF (asset, asset->key_id())
@@ -53,6 +57,7 @@ ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<AtmosAsset> asset, int64_t entry
 
 }
 
+
 ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
        : ReelAsset (node)
        , ReelMXF (node)
@@ -61,39 +66,45 @@ ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
        node->done ();
 }
 
+
 string
 ReelAtmosAsset::cpl_node_name (Standard) const
 {
        return "axd:AuxData";
 }
 
+
 pair<string, string>
 ReelAtmosAsset::cpl_node_namespace (Standard) 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";
 }
 
+
 xmlpp::Node *
 ReelAtmosAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
+       auto asset = write_to_cpl_asset (node, standard, hash());
        write_to_cpl_mxf (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 (!mxf_equals (other, opt, note)) {
                return false;
        }