X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_picture_asset.cc;h=ddc6a802eb9017bf5a297109b3322ebe9b00d9de;hb=51ae14c7e304d4fbc8d7524d584f3f4762d51f67;hp=1933c769d3ae5687c4aa6894199db938e7c39cd1;hpb=f2f2a2afc393dcaee747b97173d71a622d05d910;p=libdcp.git

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 1933c769..ddc6a802 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,10 +31,12 @@
     files in the program, then also delete it here.
 */
 
-/** @file  src/reel_picture_asset.h
- *  @brief ReelPictureAsset class.
+
+/** @file  src/reel_picture_asset.cc
+ *  @brief ReelPictureAsset class
  */
 
+
 #include "reel_picture_asset.h"
 #include "picture_asset.h"
 #include "dcp_assert.h"
@@ -45,32 +47,28 @@
 #include <iomanip>
 #include <cmath>
 
+
 using std::bad_cast;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcp;
 
-ReelPictureAsset::ReelPictureAsset ()
-	: _frame_rate (Fraction (24, 1))
-	, _screen_aspect_ratio (Fraction (1998, 1080))
-{
-
-}
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point)
-	: ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
-	, ReelMXF (asset->key_id())
+	: ReelFileAsset (asset, asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+	, ReelEncryptableAsset (asset->key_id())
 	, _frame_rate (asset->frame_rate ())
 	, _screen_aspect_ratio (asset->screen_aspect_ratio ())
 {
 
 }
 
+
 ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
-	: ReelAsset (node)
-	, ReelMXF (node)
+	: ReelFileAsset (node)
+	, ReelEncryptableAsset (node)
 {
 	_frame_rate = Fraction (node->string_child ("FrameRate"));
 	try {
@@ -86,13 +84,14 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
 	}
 }
 
+
 xmlpp::Node*
 ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	xmlpp::Node* asset = ReelAsset::write_to_cpl (node, standard);
+	auto asset = write_to_cpl_asset (node, standard, hash());
 
 	asset->add_child("FrameRate")->add_child_text(String::compose("%1 %2", _frame_rate.numerator, _frame_rate.denominator));
-	if (standard == INTEROP) {
+	if (standard == Standard::INTEROP) {
 
 		/* Allowed values for this tag from the standard */
 		float allowed[] = { 1.33, 1.66, 1.77, 1.85, 2.00, 2.39 };
@@ -119,40 +118,41 @@ ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 			);
 	}
 
-        if (key_id ()) {
-		/* Find <Hash> */
-		xmlpp::Node* hash = find_child (asset, "Hash");
-		asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
-        }
+	write_to_cpl_encryptable (asset);
 
 	return asset;
 }
 
+
 string
 ReelPictureAsset::key_type () const
 {
 	return "MDIK";
 }
 
+
 bool
-ReelPictureAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOptions opt, NoteHandler note) const
 {
-	if (!ReelAsset::equals (other, opt, note)) {
+	if (!asset_equals (other, opt, note)) {
+		return false;
+	}
+	if (!file_asset_equals (other, opt, note)) {
 		return false;
 	}
 
-	shared_ptr<const ReelPictureAsset> rpa = dynamic_pointer_cast<const ReelPictureAsset> (other);
+	auto rpa = dynamic_pointer_cast<const ReelPictureAsset>(other);
 	if (!rpa) {
 		return false;
 	}
 
 	if (_frame_rate != rpa->_frame_rate) {
-		note (DCP_ERROR, "frame rates differ in reel");
+		note (NoteType::ERROR, "frame rates differ in reel");
 		return false;
 	}
 
 	if (_screen_aspect_ratio != rpa->_screen_aspect_ratio) {
-		note (DCP_ERROR, "screen aspect ratios differ in reel");
+		note (NoteType::ERROR, "screen aspect ratios differ in reel");
 		return false;
 	}