X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_asset.cc;h=72a1937cc89f2a9ebc54935bc757ea459251ba00;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=46e0bd3c9ce2600fc4d21f0028831522c24290f4;hpb=f9df63eeff90088b68b8087e45490c5627603117;p=libdcp.git diff --git a/src/reel_asset.cc b/src/reel_asset.cc index 46e0bd3c..72a1937c 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -1,20 +1,34 @@ /* Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/reel_asset.cc @@ -27,12 +41,9 @@ #include "compose.hpp" #include #include -#include using std::pair; -using std::cout; using std::string; -using std::stringstream; using std::make_pair; using boost::shared_ptr; using namespace dcp; @@ -60,43 +71,49 @@ ReelAsset::ReelAsset (shared_ptr asset, Fraction edit_rate, int64_t intri , _intrinsic_duration (intrinsic_duration) , _entry_point (entry_point) , _duration (intrinsic_duration - entry_point) - , _hash (make_digest (asset->file (), 0)) + , _hash (asset->hash ()) { /* default _annotation_text to the leaf name of our file */ - _annotation_text = asset->file().leaf().string (); + if (asset->file ()) { + _annotation_text = asset->file()->leaf().string (); + } } ReelAsset::ReelAsset (shared_ptr node) - : Object (node->string_child ("Id")) + : Object (remove_urn_uuid (node->string_child ("Id"))) , _asset_ref (_id) , _annotation_text (node->optional_string_child ("AnnotationText").get_value_or ("")) , _edit_rate (Fraction (node->string_child ("EditRate"))) , _intrinsic_duration (node->number_child ("IntrinsicDuration")) , _entry_point (node->number_child ("EntryPoint")) , _duration (node->number_child ("Duration")) - , _hash (node->optional_string_child ("Hash").get_value_or ("")) + , _hash (node->optional_string_child ("Hash")) { - if (_id.length() > 9) { - _id = _id.substr (9); - _asset_ref.set_id (_id); - } + } -void +xmlpp::Node* ReelAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { + xmlpp::Element* a = node->add_child (cpl_node_name (standard)); pair const attr = cpl_node_attribute (standard); - xmlpp::Element* a = node->add_child (cpl_node_name ()); if (!attr.first.empty ()) { a->set_attribute (attr.first, attr.second); } + pair const ns = cpl_node_namespace (standard); + if (!ns.first.empty ()) { + a->set_namespace_declaration (ns.first, ns.second); + } a->add_child("Id")->add_child_text ("urn:uuid:" + _id); a->add_child("AnnotationText")->add_child_text (_annotation_text); a->add_child("EditRate")->add_child_text (String::compose ("%1 %2", _edit_rate.numerator, _edit_rate.denominator)); a->add_child("IntrinsicDuration")->add_child_text (raw_convert (_intrinsic_duration)); a->add_child("EntryPoint")->add_child_text (raw_convert (_entry_point)); a->add_child("Duration")->add_child_text (raw_convert (_duration)); - a->add_child("Hash")->add_child_text (_asset_ref.object()->hash ()); + if (_hash) { + a->add_child("Hash")->add_child_text (_hash.get()); + } + return a; } pair @@ -105,17 +122,22 @@ ReelAsset::cpl_node_attribute (Standard) const return make_pair ("", ""); } +pair +ReelAsset::cpl_node_namespace (Standard) const +{ + return make_pair ("", ""); +} + bool ReelAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const { if (_annotation_text != other->_annotation_text) { - stringstream s; - s << "Reel: annotation texts differ (" << _annotation_text << " vs " << other->_annotation_text << ")\n"; + string const s = "Reel: annotation texts differ (" + _annotation_text + " vs " + other->_annotation_text + ")\n"; if (!opt.reel_annotation_texts_can_differ) { - note (DCP_ERROR, s.str ()); + note (DCP_ERROR, s); return false; } else { - note (DCP_NOTE, s.str ()); + note (DCP_NOTE, s); } } @@ -149,7 +171,7 @@ ReelAsset::equals (shared_ptr other, EqualityOptions opt, NoteH } if (_asset_ref.resolved () && other->_asset_ref.resolved ()) { - return _asset_ref->equals (other->_asset_ref.object (), opt, note); + return _asset_ref->equals (other->_asset_ref.asset(), opt, note); } return true;