Move namespaces into variables.

diff --git a/src/cpl.cc b/src/cpl.cc
index c408fe9756c2632d609866a95088e483e9564961..b96e15d2c646ab95ec55ee877e545ae413f8e335 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -45,6 +45,9 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using namespace dcp;
 
+static string const cpl_interop_ns = "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#";
+static string const cpl_smpte_ns   = "http://www.smpte-ra.org/schemas/429-7/2006/CPL";
+
 CPL::CPL (string annotation_text, ContentKind content_kind)
        : _annotation_text (annotation_text)
        /* default _content_title_text to _annotation_text */
@@ -110,9 +113,9 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
        xmlpp::Document doc;
        xmlpp::Element* root;
        if (standard == INTEROP) {
-               root = doc.create_root_node ("CompositionPlaylist", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#");
+               root = doc.create_root_node ("CompositionPlaylist", cpl_interop_ns);
        } else {
-               root = doc.create_root_node ("CompositionPlaylist", "http://www.smpte-ra.org/schemas/429-7/2006/CPL");
+               root = doc.create_root_node ("CompositionPlaylist", cpl_smpte_ns);
        }
 
        if (signer) {

diff --git a/src/dcp.cc b/src/dcp.cc
index 7ec7577f8b722f70739e1c19d78cca3a2338924f..3298cfae35ad95a37502924a3086f1f7a462f7da 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -64,6 +64,13 @@ using boost::dynamic_pointer_cast;
 using boost::algorithm::starts_with;
 using namespace dcp;
 
+static string const assetmap_interop_ns = "http://www.digicine.com/PROTO-ASDCP-AM-20040311#";
+static string const assetmap_smpte_ns   = "http://www.smpte-ra.org/schemas/429-9/2007/AM";
+static string const pkl_interop_ns      = "http://www.digicine.com/PROTO-ASDCP-PKL-20040311#";
+static string const pkl_smpte_ns        = "http://www.smpte-ra.org/schemas/429-8/2007/PKL";
+static string const volindex_interop_ns = "http://www.digicine.com/PROTO-ASDCP-AM-20040311#";
+static string const volindex_smpte_ns   = "http://www.smpte-ra.org/schemas/429-9/2007/AM";
+
 DCP::DCP (boost::filesystem::path directory)
        : _directory (directory)
 {
@@ -270,9 +277,9 @@ DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared
        xmlpp::Document doc;
        xmlpp::Element* pkl;
        if (standard == INTEROP) {
-               pkl = doc.create_root_node("PackingList", "http://www.digicine.com/PROTO-ASDCP-PKL-20040311#");
+               pkl = doc.create_root_node("PackingList", pkl_interop_ns);
        } else {
-               pkl = doc.create_root_node("PackingList", "http://www.smpte-ra.org/schemas/429-8/2007/PKL");
+               pkl = doc.create_root_node("PackingList", pkl_smpte_ns);
        }
 
        if (signer) {
@@ -325,10 +332,10 @@ DCP::write_volindex (Standard standard) const
 
        switch (standard) {
        case INTEROP:
-               root = doc.create_root_node ("VolumeIndex", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#");
+               root = doc.create_root_node ("VolumeIndex", volindex_interop_ns);
                break;
        case SMPTE:
-               root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+               root = doc.create_root_node ("VolumeIndex", volindex_smpte_ns);
                break;
        default:
                DCP_ASSERT (false);
@@ -359,10 +366,10 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta
 
        switch (standard) {
        case INTEROP:
-               root = doc.create_root_node ("AssetMap", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#");
+               root = doc.create_root_node ("AssetMap", assetmap_interop_ns);
                break;
        case SMPTE:
-               root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+               root = doc.create_root_node ("AssetMap", assetmap_smpte_ns);
                break;
        default:
                DCP_ASSERT (false);