X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_atmos_asset.cc;h=958bc72cba13fbdca84c0cdb3965bb8c35f6e34d;hb=d08f6892b676caffa6f609724d3e801b563c6cc8;hp=636a7a79641a0ab47a47d1e3c44908ab0aa8e2aa;hpb=9eb185cc5872c00956a645b2ce92a3431ed7db68;p=libdcp.git diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc index 636a7a79..958bc72c 100644 --- a/src/reel_atmos_asset.cc +++ b/src/reel_atmos_asset.cc @@ -47,7 +47,8 @@ using boost::shared_ptr; using namespace dcp; ReelAtmosAsset::ReelAtmosAsset (boost::shared_ptr asset, int64_t entry_point) - : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point) + : ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) + , ReelMXF (asset, asset->key_id()) { } @@ -81,7 +82,21 @@ ReelAtmosAsset::key_type () const xmlpp::Node * ReelAtmosAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { - xmlpp::Node* asset = ReelAsset::write_to_cpl (node, standard); + 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"); return asset; } + +bool +ReelAtmosAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const +{ + if (!asset_equals (other, opt, note)) { + return false; + } + if (!mxf_equals (other, opt, note)) { + return false; + } + + return true; +}