From 2194158985f9c1300ffe24c7c6fb786cb39bbdb5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 17 Jul 2012 23:46:20 +0100
Subject: Tags -> Metadata

---
 src/dcp.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/dcp.cc')

diff --git a/src/dcp.cc b/src/dcp.cc
index efeafb12..ca2a2d14 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -27,7 +27,7 @@
 #include "sound_asset.h"
 #include "picture_asset.h"
 #include "util.h"
-#include "tags.h"
+#include "metadata.h"
 
 using namespace std;
 using namespace boost;
@@ -90,13 +90,13 @@ DCP::write_cpl (string cpl_uuid) const
 	    << "<CompositionPlaylist xmlns=\"http://www.smpte-ra.org/schemas/429-7/2006/CPL\">\n"
 	    << "  <Id>urn:uuid:" << cpl_uuid << "</Id>\n"
 	    << "  <AnnotationText>" << _name << "</AnnotationText>\n"
-	    << "  <IssueDate>" << Tags::instance()->issue_date << "</IssueDate>\n"
-	    << "  <Creator>" << Tags::instance()->creator << "</Creator>\n"
+	    << "  <IssueDate>" << Metadata::instance()->issue_date << "</IssueDate>\n"
+	    << "  <Creator>" << Metadata::instance()->creator << "</Creator>\n"
 	    << "  <ContentTitleText>" << _name << "</ContentTitleText>\n"
 	    << "  <ContentKind>" << content_type_string (_content_type) << "</ContentKind>\n"
 	    << "  <ContentVersion>\n"
-	    << "    <Id>urn:uri:" << cpl_uuid << "_" << Tags::instance()->issue_date << "</Id>\n"
-	    << "    <LabelText>" << cpl_uuid << "_" << Tags::instance()->issue_date << "</LabelText>\n"
+	    << "    <Id>urn:uri:" << cpl_uuid << "_" << Metadata::instance()->issue_date << "</Id>\n"
+	    << "    <LabelText>" << cpl_uuid << "_" << Metadata::instance()->issue_date << "</LabelText>\n"
 	    << "  </ContentVersion>\n"
 	    << "  <RatingList/>\n"
 	    << "  <ReelList>\n";
@@ -131,9 +131,9 @@ DCP::write_pkl (string pkl_uuid, string cpl_uuid, string cpl_digest, int cpl_len
 	    << "<PackingList xmlns=\"http://www.smpte-ra.org/schemas/429-8/2007/PKL\">\n"
 	    << "  <Id>urn:uuid:" << pkl_uuid << "</Id>\n"
 	    << "  <AnnotationText>" << _name << "</AnnotationText>\n"
-	    << "  <IssueDate>" << Tags::instance()->issue_date << "</IssueDate>\n"
-	    << "  <Issuer>" << Tags::instance()->issuer << "</Issuer>\n"
-	    << "  <Creator>" << Tags::instance()->creator << "</Creator>\n"
+	    << "  <IssueDate>" << Metadata::instance()->issue_date << "</IssueDate>\n"
+	    << "  <Issuer>" << Metadata::instance()->issuer << "</Issuer>\n"
+	    << "  <Creator>" << Metadata::instance()->creator << "</Creator>\n"
 	    << "  <AssetList>\n";
 
 	for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
@@ -178,10 +178,10 @@ DCP::write_assetmap (string cpl_uuid, int cpl_length, string pkl_uuid, int pkl_l
 	am << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 	   << "<AssetMap xmlns=\"http://www.smpte-ra.org/schemas/429-9/2007/AM\">\n"
 	   << "  <Id>urn:uuid:" << make_uuid() << "</Id>\n"
-	   << "  <Creator>" << Tags::instance()->creator << "</Creator>\n"
+	   << "  <Creator>" << Metadata::instance()->creator << "</Creator>\n"
 	   << "  <VolumeCount>1</VolumeCount>\n"
-	   << "  <IssueDate>" << Tags::instance()->issue_date << "</IssueDate>\n"
-	   << "  <Issuer>" << Tags::instance()->issuer << "</Issuer>\n"
+	   << "  <IssueDate>" << Metadata::instance()->issue_date << "</IssueDate>\n"
+	   << "  <Issuer>" << Metadata::instance()->issuer << "</Issuer>\n"
 	   << "  <AssetList>\n";
 
 	am << "    <Asset>\n"
-- 
cgit v1.2.3