Merge branch 'master' of ssh://main.carlh.net/home/carl/git/libdcp

11 files changed, 9 insertions, 9 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 6fc52be5..67376377 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -195,7 +195,7 @@ CPL::add_reel (shared_ptr<Reel> reel)
 boost::filesystem::path
 CPL::filename () const
 {
-	return _directory / String::compose ("%1_cpl.xml", _id);
+	return _directory / String::compose ("cpl_%1.xml", _id);
 }
 
 void
@@ -286,7 +286,7 @@ CPL::write_to_assetmap (xmlpp::Node* node) const
 	asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
 	xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
 	xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-	chunk->add_child("Path")->add_child_text (_id + "_cpl.xml");
+	chunk->add_child("Path")->add_child_text ("cpl_" + _id + ".xml");
 	chunk->add_child("VolumeIndex")->add_child_text ("1");
 	chunk->add_child("Offset")->add_child_text("0");
 	chunk->add_child("Length")->add_child_text (raw_convert<string> (_length));
diff --git a/src/dcp.cc b/src/dcp.cc
index 7cce30fe..87a9565b 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -84,7 +84,7 @@ DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, sha
 	boost::filesystem::path p;
 	p /= _directory;
 	stringstream s;
-	s << pkl_uuid << "_pkl.xml";
+	s << "pkl_" << pkl_uuid << ".xml";
 	p /= s.str();
 
 	xmlpp::Document doc;
@@ -186,7 +186,7 @@ DCP::write_assetmap (string pkl_uuid, int pkl_length, bool interop, XMLMetadata
 	asset->add_child("PackingList")->add_child_text ("true");
 	xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
 	xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-	chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml");
+	chunk->add_child("Path")->add_child_text ("pkl_" + pkl_uuid + ".xml");
 	chunk->add_child("VolumeIndex")->add_child_text ("1");
 	chunk->add_child("Offset")->add_child_text ("0");
 	chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 201d3c35..5980952b 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (encryption)
 
 	d.write_xml (false, xml_metadata, signer);
 
-	boost::filesystem::path cpl_path = boost::filesystem::path ("build/test/DCP/bar") / (cpl->id() + "_cpl.xml");
+	boost::filesystem::path cpl_path = boost::filesystem::path ("build/test/DCP/bar") / ("cpl_" + cpl->id() + ".xml");
 
 	libdcp::KDM kdm (
 		cpl_path,
diff --git a/test/ref/DCP/bar/ASSETMAP.xml b/test/ref/DCP/bar/ASSETMAP.xml
index c3ea8bed..d4d03be0 100644
--- a/test/ref/DCP/bar/ASSETMAP.xml
+++ b/test/ref/DCP/bar/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8019</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c</Id><ChunkList><Chunk><Path>7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8613</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>308398</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>28840</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8019</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c</Id><ChunkList><Chunk><Path>cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8613</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>308398</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>28840</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/bar/7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml b/test/ref/DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml
index f95f7056..f95f7056 100644
--- a/test/ref/DCP/bar/7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c_cpl.xml
+++ b/test/ref/DCP/bar/cpl_7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c.xml
diff --git a/test/ref/DCP/bar/a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml b/test/ref/DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml
index 56df1f42..56df1f42 100644
--- a/test/ref/DCP/bar/a12d2c1f-0daa-4a30-a4cd-c4266ac172a7_pkl.xml
+++ b/test/ref/DCP/bar/pkl_a12d2c1f-0daa-4a30-a4cd-c4266ac172a7.xml
diff --git a/test/ref/DCP/foo/ASSETMAP.xml b/test/ref/DCP/foo/ASSETMAP.xml
index eaace0ab..b1a4be7e 100644
--- a/test/ref/DCP/foo/ASSETMAP.xml
+++ b/test/ref/DCP/foo/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bf</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>899</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>305326</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bf</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>899</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>305326</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml b/test/ref/DCP/foo/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 996286d7..996286d7 100644
--- a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
+++ b/test/ref/DCP/foo/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
diff --git a/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml b/test/ref/DCP/foo/pkl_df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb.xml
index 5e5028df..5e5028df 100644
--- a/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml
+++ b/test/ref/DCP/foo/pkl_df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb.xml
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 19ed482a..f5a5054d 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	libdcp::XMLMetadata metadata;
 	cpl->write_xml (true, metadata, signer);
 
-	boost::filesystem::path cpl_path = work_dir / (cpl->id() + "_cpl.xml");
+	boost::filesystem::path cpl_path = work_dir / ("cpl_" + cpl->id() + ".xml");
 
 	/* A KDM using our certificate chain's leaf key pair */
 	libdcp::KDM kdm_A (
diff --git a/wscript b/wscript
index 701c3be6..a64fe76b 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libdcp'
-VERSION = '0.100.0devel'
+VERSION = '0.101.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')