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_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP
index b94b0c56..72343f8a 100644
--- a/test/ref/DCP/dcp_test7/ASSETMAP
+++ b/test/ref/DCP/dcp_test7/ASSETMAP
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#"><Id>urn:uuid:d41b9281-aed6-4727-a0e5-fe6a94490e2a</Id><AnnotationText>Created by libdcp</AnnotationText><VolumeCount>1</VolumeCount><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:90de5ece-9755-4264-8431-20a99062c4e5</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_90de5ece-9755-4264-8431-20a99062c4e5.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1096</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:e416fe3c-af74-4699-8371-f506d6143534</Id><ChunkList><Chunk><Path>cpl_e416fe3c-af74-4699-8371-f506d6143534.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1376</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:01098c56-7c8c-4a66-bf9b-548c9aaa377c</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:8679b83d-708e-4bf2-9884-8df24984dbf1</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.digicine.com/PROTO-ASDCP-AM-20040311#"><Id>urn:uuid:d1c42121-73a5-4d1d-b1c2-8165695d58ff</Id><AnnotationText>Created by libdcp</AnnotationText><VolumeCount>1</VolumeCount><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:a800aea0-904b-4bd0-9250-374fdb46528b</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1096</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id><ChunkList><Chunk><Path>cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1376</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6</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_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf
index 3c02d277..ec96c55c 100644
--- a/test/ref/DCP/dcp_test7/audio.mxf
+++ b/test/ref/DCP/dcp_test7/audio.mxf
diff --git a/test/ref/DCP/dcp_test7/cpl_e416fe3c-af74-4699-8371-f506d6143534.xml b/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
index 70d04fcd..892d4800 100644
--- a/test/ref/DCP/dcp_test7/cpl_e416fe3c-af74-4699-8371-f506d6143534.xml
+++ b/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"><Id>urn:uuid:e416fe3c-af74-4699-8371-f506d6143534</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:c47e00ab-c686-406a-a89d-1da5b2e6884f</Id><AssetList><MainPicture><Id>urn:uuid:01098c56-7c8c-4a66-bf9b-548c9aaa377c</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>SYVUqfJCMgm5EP02Wa6lBdArSbM=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>1.33</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:8679b83d-708e-4bf2-9884-8df24984dbf1</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>DCVer2161vQrrzUx6Zoi+AM1xK0=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"><Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</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:f3452d7a-2f0d-4758-b0ab-63432f863752</Id><AssetList><MainPicture><Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>tdGCQpv8Yyz8FSafi+2UMEwbmW8=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>1.33</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>f5srKV6hTI6FRxgXGnhLPQqn12w=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test7/pkl_90de5ece-9755-4264-8431-20a99062c4e5.xml b/test/ref/DCP/dcp_test7/pkl_90de5ece-9755-4264-8431-20a99062c4e5.xml
deleted file mode 100644
index 8b97dbec..00000000
--- a/test/ref/DCP/dcp_test7/pkl_90de5ece-9755-4264-8431-20a99062c4e5.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"><Id>urn:uuid:90de5ece-9755-4264-8431-20a99062c4e5</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:e416fe3c-af74-4699-8371-f506d6143534</Id><AnnotationText>e416fe3c-af74-4699-8371-f506d6143534</AnnotationText><Hash>rERrsk2YZiEXjbNDz6RCrhaRa4s=</Hash><Size>1376</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:01098c56-7c8c-4a66-bf9b-548c9aaa377c</Id><AnnotationText>01098c56-7c8c-4a66-bf9b-548c9aaa377c</AnnotationText><Hash>SYVUqfJCMgm5EP02Wa6lBdArSbM=</Hash><Size>26080</Size><Type>application/x-smpte-mxf;asdcpKind=Picture</Type></Asset><Asset><Id>urn:uuid:8679b83d-708e-4bf2-9884-8df24984dbf1</Id><AnnotationText>8679b83d-708e-4bf2-9884-8df24984dbf1</AnnotationText><Hash>DCVer2161vQrrzUx6Zoi+AM1xK0=</Hash><Size>161326</Size><Type>application/x-smpte-mxf;asdcpKind=Sound</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml b/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
new file mode 100644
index 00000000..d388c92f
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"><Id>urn:uuid:a800aea0-904b-4bd0-9250-374fdb46528b</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:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id><AnnotationText>1d513f84-5856-4f91-a88a-4d452cc6a28a</AnnotationText><Hash>QSaFbXtRDgj1cKSTKqt1eRQHUSQ=</Hash><Size>1376</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id><AnnotationText>cb2b7aa9-a378-4392-86f8-df013863fdd0</AnnotationText><Hash>tdGCQpv8Yyz8FSafi+2UMEwbmW8=</Hash><Size>26080</Size><Type>application/x-smpte-mxf;asdcpKind=Picture</Type></Asset><Asset><Id>urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6</Id><AnnotationText>e63718c9-fa72-4dd9-a144-8736591b08b6</AnnotationText><Hash>f5srKV6hTI6FRxgXGnhLPQqn12w=</Hash><Size>161326</Size><Type>application/x-smpte-mxf;asdcpKind=Sound</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf
index e0fec7b7..ee1d3646 100644
--- a/test/ref/DCP/dcp_test7/video.mxf
+++ b/test/ref/DCP/dcp_test7/video.mxf