Tidy repeated call of make_uuid() and don't put urn:uuid: in front of default content version label text as it's a bit confusing.

6 files changed, 4 insertions, 4 deletions

diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml
index cf150d0e..7cd2eae6 100644
--- a/test/ref/DCP/dcp_test2/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test2/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:fc17a5e4-1127-4eb7-847f-a982d1ad0b34</Id><AnnotationText>Created by libdcp</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:2afb4e45-f01c-4abc-a354-2ffc0c240a5e</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1029</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id><ChunkList><Chunk><Path>cpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1498</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>35032</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:41eebce6-86f2-4939-b27a-81e4dd3606e9</Id><AnnotationText>Created by libdcp</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:9f19589a-01e5-4093-b23b-a32e143e5956</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1029</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id><ChunkList><Chunk><Path>cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1498</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>35032</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index 255b6a11..d5f5f745 100644
--- a/test/ref/DCP/dcp_test2/audio.mxf
+++ b/test/ref/DCP/dcp_test2/audio.mxf
diff --git a/test/ref/DCP/dcp_test2/cpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml b/test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml
index cc2434dd..a12c4f86 100644
--- a/test/ref/DCP/dcp_test2/cpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
+++ b/test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:41eebce6-86f2-4939-b27a-81e4dd3606e9</Id><AssetList><MainSound><Id>urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>hNT4mrE0QqE9NgUzqf+Eh3CYGWE=</Hash></MainSound><msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL"><Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>M6O1IKSNbWdBQI6zm6AUFOUsrsg=</Hash><FrameRate>48 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></msp-cpl:MainStereoscopicPicture></AssetList></Reel></ReelList></CompositionPlaylist>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:646747f3-51ee-47ec-a0a2-5f8c415818e8</Id><AssetList><MainSound><Id>urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>yOPZZcSUfpF0dwuq4awCqOGjbaE=</Hash></MainSound><msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL"><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>z3sZzo6/x8MT82rmGWHd0bi87R0=</Hash><FrameRate>48 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></msp-cpl:MainStereoscopicPicture></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml b/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml
deleted file mode 100644
index 5df60c82..00000000
--- a/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5e</Id><AnnotationText>Created by libdcp</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id><AnnotationText>cd49971e-bf4c-4594-8474-54ebef09a40c</AnnotationText><Hash>9UToAEAcnkP2slky4m9+zpKr1Bw=</Hash><Size>1498</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id><AnnotationText>07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</AnnotationText><Hash>M6O1IKSNbWdBQI6zm6AUFOUsrsg=</Hash><Size>35032</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514</Id><AnnotationText>58d42406-691b-47e3-be74-e7a7b49c9514</AnnotationText><Hash>hNT4mrE0QqE9NgUzqf+Eh3CYGWE=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml b/test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml
new file mode 100644
index 00000000..0f2252a4
--- /dev/null
+++ b/test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:9f19589a-01e5-4093-b23b-a32e143e5956</Id><AnnotationText>Created by libdcp</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id><AnnotationText>48db27c3-4964-46a2-8b02-3e5570efb42d</AnnotationText><Hash>KOdSrcqGMcQX0HJAlyDKbC8eefY=</Hash><Size>1498</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><AnnotationText>63c3aece-c581-4603-b612-75e43f0c0430</AnnotationText><Hash>z3sZzo6/x8MT82rmGWHd0bi87R0=</Hash><Size>35032</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id><AnnotationText>e5c3091b-f61e-459c-9faf-210bd4d3c7bf</AnnotationText><Hash>yOPZZcSUfpF0dwuq4awCqOGjbaE=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf
index 42cae0b2..2e7309e5 100644
--- a/test/ref/DCP/dcp_test2/video.mxf
+++ b/test/ref/DCP/dcp_test2/video.mxf