Rename write_to_cpl_base -> write_to_cpl_asset.

8 files changed, 8 insertions, 8 deletions

diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index 2457c079..8cac7403 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -77,7 +77,7 @@ ReelAsset::ReelAsset (shared_ptr<const cxml::Node> node)
 }
 
 xmlpp::Node*
-ReelAsset::write_to_cpl_base (xmlpp::Node* node, Standard standard, optional<string> hash) const
+ReelAsset::write_to_cpl_asset (xmlpp::Node* node, Standard standard, optional<string> hash) const
 {
 	xmlpp::Element* a = node->add_child (cpl_node_name (standard));
 	pair<string, string> const attr = cpl_node_attribute (standard);
diff --git a/src/reel_asset.h b/src/reel_asset.h
index 072d55fd..07ddcc18 100644
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -119,7 +119,7 @@ protected:
 	/** @return Any namespace that should be used on the asset's node in the CPL */
 	virtual std::pair<std::string, std::string> cpl_node_namespace (Standard) const;
 
-	xmlpp::Node* write_to_cpl_base (xmlpp::Node* node, Standard standard, boost::optional<std::string> hash) const;
+	xmlpp::Node* write_to_cpl_asset (xmlpp::Node* node, Standard standard, boost::optional<std::string> hash) const;
 
 	int64_t _intrinsic_duration;           ///< The &lt;IntrinsicDuration&gt; from the reel's entry for this asset
 	boost::optional<int64_t> _duration;    ///< The &lt;Duration&gt; from the reel's entry for this asset, if present
diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index 1ce8b6ea..637f188d 100644
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -82,7 +82,7 @@ ReelAtmosAsset::key_type () const
 xmlpp::Node *
 ReelAtmosAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
+	xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
 	asset->add_child("axd:DataType")->add_child_text("urn:smpte:ul:060e2b34.04010105.0e090604.00000000");
 	return asset;
 }
diff --git a/src/reel_closed_caption_asset.cc b/src/reel_closed_caption_asset.cc
index 435c3438..c9162a48 100644
--- a/src/reel_closed_caption_asset.cc
+++ b/src/reel_closed_caption_asset.cc
@@ -99,13 +99,13 @@ ReelClosedCaptionAsset::key_type () const
 xmlpp::Node *
 ReelClosedCaptionAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
 
         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());
 	}
+	xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
 
 	if (_language) {
 		asset->add_child("Language")->add_child_text(*_language);
diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index 8c5f66dd..9b6d69cf 100644
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -105,7 +105,7 @@ xmlpp::Node*
 ReelMarkersAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
 	int const tcr = edit_rate().numerator / edit_rate().denominator;
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, optional<string>());
+	xmlpp::Node* asset = write_to_cpl_asset (node, standard, optional<string>());
 	xmlpp::Node* ml = asset->add_child("MarkerList");
 	for (map<Marker, Time>::const_iterator i = _markers.begin(); i != _markers.end(); ++i) {
 		xmlpp::Node* m = ml->add_child("Marker");
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 5b4ced67..8c82e01b 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -82,7 +82,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
 xmlpp::Node*
 ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
+	xmlpp::Node* 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) {
diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 25259f42..4073472e 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -74,7 +74,6 @@ ReelSoundAsset::key_type () const
 xmlpp::Node *
 ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
 
         if (key_id ()) {
 		/* Find <Hash> */
@@ -82,6 +81,7 @@ ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 		asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
         }
 
+	xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
 	return asset;
 }
 
diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index a90513d5..49ac033c 100644
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -76,7 +76,6 @@ ReelSubtitleAsset::key_type () const
 xmlpp::Node *
 ReelSubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-	xmlpp::Node* asset = write_to_cpl_base (node, standard, hash());
 
 	if (key_id ()) {
 		/* Find <Hash> */
@@ -84,6 +83,7 @@ ReelSubtitleAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 		asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
 	}
 
+	xmlpp::Node* asset = write_to_cpl_asset (node, standard, hash());
 	return asset;
 }