Tags -> Metadata

5 files changed, 30 insertions, 29 deletions

diff --git a/src/asset.cc b/src/asset.cc
index 4a111a19..51339071 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -27,7 +27,7 @@
 #include "KM_util.h"
 #include "asset.h"
 #include "util.h"
-#include "tags.h"
+#include "metadata.h"
 
 using namespace std;
 using namespace boost;
@@ -74,9 +74,9 @@ Asset::write_to_assetmap (ostream& s) const
 void
 Asset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
 {
-	writer_info->ProductVersion = Tags::instance()->product_version;
-	writer_info->CompanyName = Tags::instance()->company_name;
-	writer_info->ProductName = Tags::instance()->product_name.c_str();
+	writer_info->ProductVersion = Metadata::instance()->product_version;
+	writer_info->CompanyName = Metadata::instance()->company_name;
+	writer_info->ProductName = Metadata::instance()->product_name.c_str();
 
 	writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
 	unsigned int c;
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"
diff --git a/src/tags.cc b/src/metadata.cc
index 0adc63c8..797d645d 100644
--- a/src/tags.cc
+++ b/src/metadata.cc
@@ -17,15 +17,15 @@
 
 */
 
-#include "tags.h"
+#include "metadata.h"
 
 using namespace std;
 using namespace libdcp;
 
-Tags* Tags::_instance = 0;
+Metadata* Metadata::_instance = 0;
 
-/** Construct a Tags object with some default values */
-Tags::Tags ()
+/** Construct a Metadata object with some default values */
+Metadata::Metadata ()
 	: company_name ("libdcp")
 	, product_name ("libdcp")
 	, product_version (LIBDCP_VERSION)
@@ -40,12 +40,12 @@ Tags::Tags ()
 	issue_date = string (buffer);
 }
 
-/** @return Singleton Tags instance */
-Tags *
-Tags::instance ()
+/** @return Singleton Metadata instance */
+Metadata *
+Metadata::instance ()
 {
 	if (_instance == 0) {
-		_instance = new Tags;
+		_instance = new Metadata;
 	}
 
 	return _instance;
diff --git a/src/tags.h b/src/metadata.h
index b82fef61..7660c4dd 100644
--- a/src/tags.h
+++ b/src/metadata.h
@@ -26,10 +26,10 @@ namespace libdcp
  *  to the DCP.  The values are initialised, and can be modified
  *  if desired.
  */
-class Tags
+class Metadata
 {
 public:
-	static Tags* instance ();
+	static Metadata* instance ();
 
 	std::string company_name;
 	std::string product_name;
@@ -39,10 +39,10 @@ public:
 	std::string issue_date;
 
 private:
-	Tags ();
+	Metadata ();
 
-	/** Singleton instance of Tags */
-	static Tags* _instance;
+	/** Singleton instance of Metadata */
+	static Metadata* _instance;
 };
 
 }
diff --git a/src/wscript b/src/wscript
index df41cb2c..7417dee5 100644
--- a/src/wscript
+++ b/src/wscript
@@ -11,11 +11,12 @@ def build(bld):
                  sound_asset.cc
                  picture_asset.cc
                  util.cc
-                 tags.cc
+                 metadata.cc
                  """
 
     headers = """
               dcp.h
+              metadata.h
               """
 
     bld.install_files('${PREFIX}/include/libdcp', headers)