Use the <Id> read in when the Reel was created from XML (if appropriate)

when writing it out again, rather than creating a new one each time.

Also there is the associated test churn here from removing a call
to make_uuid().

5 files changed, 10 insertions, 10 deletions

diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index 9c8e07c5..dfcc1bc9 100644
--- a/test/ref/write_interop_subtitle_test3/ASSETMAP
+++ b/test/ref/write_interop_subtitle_test3/ASSETMAP
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
-  <Id>urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34</Id>
+  <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <VolumeCount>1</VolumeCount>
   <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
@@ -8,11 +8,11 @@
   <Creator>libdcp</Creator>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
+      <Id>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml</Path>
+          <Path>pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1114</Length>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
index 0f2e8d70..0277187c 100644
--- a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml
+++ b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
@@ -1,6 +1,6 @@
 <?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>
+  <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
   <Issuer>libdcp</Issuer>
@@ -8,13 +8,13 @@
   <ContentTitleText>My film</ContentTitleText>
   <ContentKind>feature</ContentKind>
   <ContentVersion>
-    <Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id>
+    <Id>urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0</Id>
     <LabelText>foo</LabelText>
   </ContentVersion>
   <RatingList/>
   <ReelList>
     <Reel>
-      <Id>urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696</Id>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <AssetList>
         <MainSubtitle>
           <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
@@ -23,7 +23,7 @@
           <IntrinsicDuration>6046</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>6046</Duration>
-          <Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash>
+          <Hash>cVnFjMLTQnSIAlIzJpNB/p7B230=</Hash>
         </MainSubtitle>
       </AssetList>
     </Reel>
diff --git a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
index 89b53cf2..89b53cf2 100644
--- a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png
+++ b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml
index 3f38ee57..23d28034 120000
--- a/test/ref/write_interop_subtitle_test3/pkl.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl.xml
@@ -1 +1 @@
-pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
\ No newline at end of file
+pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml
\ No newline at end of file
diff --git a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml b/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml
index 368c9f24..5e721188 100644
--- a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
-  <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
+  <Id>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
   <Issuer>libdcp</Issuer>
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
       <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>P2gjv5LMQFMu0BH4RLAfFVVXNRA=</Hash>
+      <Hash>hu0RaV4ZgrcqQQtgOW4r/YznVo0=</Hash>
       <Size>1105</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
     </Asset>