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.

7 files changed, 9 insertions, 3 deletions

diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index 82fe845a..45bcc904 100644
--- a/test/ref/write_interop_subtitle_test3/ASSETMAP
+++ b/test/ref/write_interop_subtitle_test3/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:5bdc7da4-eaf1-43e6-854f-7a1175edf94a</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><VolumeCount>1</VolumeCount><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:8d98d2e1-d2a1-458f-b96b-295e5b5d0860</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_8d98d2e1-d2a1-458f-b96b-295e5b5d0860.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>993</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id><ChunkList><Chunk><Path>cpl_9f134b47-ab8d-4c3c-adbf-f494b1544283.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>970</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><ChunkList><Chunk><Path>subs.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>414</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b</Id><ChunkList><Chunk><Path>822bd341-c751-45b1-94d2-410e4ffcff1b.png</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>44935</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#"><Id>urn:uuid:20a39790-cad4-4342-98d9-0b0cf1cb6027</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><VolumeCount>1</VolumeCount><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:f5aab304-8145-44e3-a265-aa8d8812d8a2</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>993</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id><ChunkList><Chunk><Path>cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>970</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><ChunkList><Chunk><Path>subs.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>414</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id><ChunkList><Chunk><Path>ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>44935</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/write_interop_subtitle_test3/VOLINDEX b/test/ref/write_interop_subtitle_test3/VOLINDEX
new file mode 100644
index 00000000..11c7615f
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/VOLINDEX
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VolumeIndex xmlns="http://www.digicine.com/PROTO-ASDCP-VL-20040311#"><Index>1</Index></VolumeIndex>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml b/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml
new file mode 100644
index 00000000..a4b8bf89
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"><Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><ContentTitleText>My film</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id><LabelText>foo</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696</Id><AssetList><MainSubtitle><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><AnnotationText>subs.xml</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>6046</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>6046</Duration><Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash></MainSubtitle></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png b/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png
new file mode 100644
index 00000000..89b53cf2
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png
diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml
index 995fabdb..638743e1 100644
--- a/test/ref/write_interop_subtitle_test3/pkl.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"><Id>urn:uuid:8d98d2e1-d2a1-458f-b96b-295e5b5d0860</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id><AnnotationText>9f134b47-ab8d-4c3c-adbf-f494b1544283</AnnotationText><Hash>X3ymjtLWzUZ0Av4L7y2/2X3wlB0=</Hash><Size>970</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText><Hash>+k1Lnon0dJab5s8+wucSdGVy3Go=</Hash><Size>414</Size><Type>text/xml;asdcpKind=Subtitle</Type></Asset><Asset><Id>urn:uuid:822bd341-c751-45b1-94d2-410e4ffcff1b</Id><Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash><Size>44935</Size><Type>image/png</Type></Asset></AssetList></PackingList>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"><Id>urn:uuid:f5aab304-8145-44e3-a265-aa8d8812d8a2</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id><AnnotationText>f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</AnnotationText><Hash>0OlJaTjmCJHDPsuc+h+cBcQq0rQ=</Hash><Size>970</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText><Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash><Size>414</Size><Type>text/xml;asdcpKind=Subtitle</Type></Asset><Asset><Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id><Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash><Size>44935</Size><Type>image/png</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml b/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml
new file mode 100644
index 00000000..638743e1
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.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:f5aab304-8145-44e3-a265-aa8d8812d8a2</Id><AnnotationText>Created by libdcp1.6.1devel</AnnotationText><IssueDate>2018-09-02T04:45:18+00:00</IssueDate><Issuer>libdcp1.6.1devel</Issuer><Creator>libdcp1.6.1devel</Creator><AssetList><Asset><Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id><AnnotationText>f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</AnnotationText><Hash>0OlJaTjmCJHDPsuc+h+cBcQq0rQ=</Hash><Size>970</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id><AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText><Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash><Size>414</Size><Type>text/xml;asdcpKind=Subtitle</Type></Asset><Asset><Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id><Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash><Size>44935</Size><Type>image/png</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/write_interop_subtitle_test3/subs.xml b/test/ref/write_interop_subtitle_test3/subs.xml
index 7ba72e47..86c4f0aa 100644
--- a/test/ref/write_interop_subtitle_test3/subs.xml
+++ b/test/ref/write_interop_subtitle_test3/subs.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><ReelNumber>1</ReelNumber><Language>EN</Language><Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0"><Image VAlign="top" VPosition="80">822bd341-c751-45b1-94d2-410e4ffcff1b.png</Image></Subtitle></DCSubtitle>
+<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><ReelNumber>1</ReelNumber><Language>EN</Language><Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0"><Image VAlign="top" VPosition="80">ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png</Image></Subtitle></DCSubtitle>