projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OK note when PKL and CPL annotation texts match.
[libdcp.git]
/
src
/
reel_atmos_asset.cc
diff --git
a/src/reel_atmos_asset.cc
b/src/reel_atmos_asset.cc
index 9dccbbcb6cfdf28e0ee84b080050e93e8a0a9b9c..c2cdb7f30d4bdb6d07f9a880bfa1114285085c29 100644
(file)
--- a/
src/reel_atmos_asset.cc
+++ b/
src/reel_atmos_asset.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-20
21
Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
This file is part of libdcp.
@@
-31,14
+31,20
@@
files in the program, then also delete it here.
*/
files in the program, then also delete it here.
*/
+
/** @file src/reel_atmos_asset.cc
/** @file src/reel_atmos_asset.cc
- * @brief ReelAtmosAsset class
.
+ * @brief ReelAtmosAsset class
*/
*/
+
#include "atmos_asset.h"
#include "reel_atmos_asset.h"
#include "atmos_asset.h"
#include "reel_atmos_asset.h"
+#include "warnings.h"
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
+
using std::string;
using std::pair;
using std::string;
using std::pair;
@@
-46,55
+52,53
@@
using std::make_pair;
using std::shared_ptr;
using namespace dcp;
using std::shared_ptr;
using namespace dcp;
+
ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<AtmosAsset> asset, int64_t entry_point)
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())
+ : ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
{
}
{
}
+
ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<const cxml::Node> node)
- : ReelAsset (node)
- , ReelMXF (node)
+ : ReelFileAsset (node)
{
node->ignore_child ("DataType");
node->done ();
}
{
node->ignore_child ("DataType");
node->done ();
}
+
string
ReelAtmosAsset::cpl_node_name (Standard) const
{
return "axd:AuxData";
}
string
ReelAtmosAsset::cpl_node_name (Standard) const
{
return "axd:AuxData";
}
+
pair<string, string>
pair<string, string>
-ReelAtmosAsset::cpl_node_namespace (
Standard
) const
+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";
-}
-xmlpp::
Node
*
-ReelAtmosAsset::write_to_cpl
(xmlpp::Node
* node, Standard standard) const
+xmlpp::
Element
*
+ReelAtmosAsset::write_to_cpl
(xmlpp::Element
* node, Standard standard) const
{
{
- xmlpp::Node* 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");
+ auto asset = ReelFileAsset::write_to_cpl (node, standard);
+ cxml::add_text_child(asset, "axd:DataType", "urn:smpte:ul:060e2b34.04010105.0e090604.00000000");
return asset;
}
return asset;
}
+
bool
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;
}
{
if (!asset_equals (other, opt, note)) {
return false;
}
- if (!mxf_equals (other, opt, note)) {
+
+ if (!file_asset_equals (other, opt, note)) {
return false;
}
return false;
}