Somewhat hacky rearrangement to support multiple CPLs per DCP.

5 files changed, 23 insertions, 23 deletions

diff --git a/test/ref/DCP/9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml b/test/ref/DCP/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
index 1cd273fc..59d50075 100644
--- a/test/ref/DCP/9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml
+++ b/test/ref/DCP/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:9892e944-5046-4dbb-af7c-f50742f62fc2</Id>
+  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
   <AnnotationText>A Test DCP</AnnotationText>
   <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
   <Creator>OpenDCP 0.0.25</Creator>
   <ContentTitleText>A Test DCP</ContentTitleText>
   <ContentKind>feature</ContentKind>
   <ContentVersion>
-    <Id>urn:uri:9892e944-5046-4dbb-af7c-f50742f62fc2_2012-07-17T04:45:18+00:00</Id>
-    <LabelText>9892e944-5046-4dbb-af7c-f50742f62fc2_2012-07-17T04:45:18+00:00</LabelText>
+    <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>
@@ -16,7 +16,7 @@
       <Id>urn:uuid:379fa64c-ad71-46cf-bef7-b45624006610</Id>
       <AssetList>
         <MainPicture>
-          <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+          <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
           <AnnotationText>video.mxf</AnnotationText>
           <EditRate>24 1</EditRate>
           <IntrinsicDuration>24</IntrinsicDuration>
@@ -26,7 +26,7 @@
           <ScreenAspectRatio>32 32</ScreenAspectRatio>
         </MainPicture>
         <MainSound>
-          <Id>urn:uuid:67b9341e-cadd-4dac-9d5c-f5a1d59f2d06</Id>
+          <Id>urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7</Id>
           <AnnotationText>audio.mxf</AnnotationText>
           <EditRate>24 1</EditRate>
           <IntrinsicDuration>24</IntrinsicDuration>
diff --git a/test/ref/DCP/ASSETMAP.xml b/test/ref/DCP/ASSETMAP.xml
index b0168478..defe18da 100644
--- a/test/ref/DCP/ASSETMAP.xml
+++ b/test/ref/DCP/ASSETMAP.xml
@@ -19,10 +19,10 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:9892e944-5046-4dbb-af7c-f50742f62fc2</Id>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <ChunkList>
         <Chunk>
-          <Path>9892e944-5046-4dbb-af7c-f50742f62fc2_cpl.xml</Path>
+          <Path>81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1526</Length>
@@ -30,24 +30,24 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Id>urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7</Id>
       <ChunkList>
         <Chunk>
-          <Path>video.mxf</Path>
+          <Path>audio.mxf</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>26080</Length>
+          <Length>305326</Length>
         </Chunk>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:67b9341e-cadd-4dac-9d5c-f5a1d59f2d06</Id>
+      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
       <ChunkList>
         <Chunk>
-          <Path>audio.mxf</Path>
+          <Path>video.mxf</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>305326</Length>
+          <Length>26080</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/DCP/audio.mxf b/test/ref/DCP/audio.mxf
index 52f92d21..9bc735af 100644
--- a/test/ref/DCP/audio.mxf
+++ b/test/ref/DCP/audio.mxf
diff --git a/test/ref/DCP/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml b/test/ref/DCP/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml
index 98e3db81..7a8ec697 100644
--- a/test/ref/DCP/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml
+++ b/test/ref/DCP/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml
@@ -7,22 +7,22 @@
   <Creator>OpenDCP 0.0.25</Creator>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
-      <AnnotationText>video.mxf</AnnotationText>
-      <Hash>VB9LCTmiD9OLlw4SvrEWUm5d67Q=</Hash>
-      <Size>26080</Size>
+      <Id>urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7</Id>
+      <AnnotationText>audio.mxf</AnnotationText>
+      <Hash>+qImGHkt/XouNaJ1V/+7BtcB4VU=</Hash>
+      <Size>305326</Size>
       <Type>application/mxf</Type>
     </Asset>
     <Asset>
-      <Id>urn:uuid:67b9341e-cadd-4dac-9d5c-f5a1d59f2d06</Id>
-      <AnnotationText>audio.mxf</AnnotationText>
-      <Hash>HapNpn7MjiJLa1OHRI61Rx8N/is=</Hash>
-      <Size>305326</Size>
+      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
+      <AnnotationText>video.mxf</AnnotationText>
+      <Hash>E2vhyxdJQhEzSQZdp31w84ZZpfk=</Hash>
+      <Size>26080</Size>
       <Type>application/mxf</Type>
     </Asset>
     <Asset>
-      <Id>urn:uuid:9892e944-5046-4dbb-af7c-f50742f62fc2</Id>
-      <Hash>PbXuvpUOKccTLMxg/lEbaXvNCT4=</Hash>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Hash>TTn7vvdUQi/G+KaW1Pym/DjxULM=</Hash>
       <Size>1526</Size>
       <Type>text/xml</Type>
     </Asset>
diff --git a/test/ref/DCP/video.mxf b/test/ref/DCP/video.mxf
index 70040fc3..645fb85a 100644
--- a/test/ref/DCP/video.mxf
+++ b/test/ref/DCP/video.mxf