Don't write MCA subdescriptors for channels that don't exist in the MXF (#2631).v1.8.86

This causes some test ID churn.

4 files changed, 8 insertions, 8 deletions

diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml
index 68d9a5cb..b32d045c 100644
--- a/test/ref/DCP/dcp_test2/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
-  <Id>urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3</Id>
+  <Id>urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <Creator>OpenDCP 0.0.25</Creator>
   <VolumeCount>1</VolumeCount>
@@ -8,11 +8,11 @@
   <Issuer>OpenDCP 0.0.25</Issuer>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
+      <Id>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml</Path>
+          <Path>pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1380</Length>
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index 4416225c..e8bd446f 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_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index d9eb222e..52a7779a 100644
--- a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -14,7 +14,7 @@
   <RatingList/>
   <ReelList>
     <Reel>
-      <Id>urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297</Id>
+      <Id>urn:uuid:d98861e8-aefc-433d-9e96-1745e7ba039e</Id>
       <AssetList>
         <MainSound>
           <Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
@@ -22,7 +22,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>3PtaGoYcvBdq5WYiK0cmeDwm8d0=</Hash>
+          <Hash>NzWhEbTccUIh1sSXIbU+8POVui0=</Hash>
         </MainSound>
         <msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
           <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
diff --git a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml
index 44da5c43..061e8a6a 100644
--- a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
+++ b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
+  <Id>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
   <Issuer>OpenDCP 0.0.25</Issuer>
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>6F7kAEYbNdv6gz6PG5JcMjGF8kU=</Hash>
+      <Hash>zaAcrAcv0oOzOa3etTP6xDfzQko=</Hash>
       <Size>1686</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -25,7 +25,7 @@
     <Asset>
       <Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
       <AnnotationText>fc843acc-1ad9-4808-b9ed-33f5319e047d</AnnotationText>
-      <Hash>3PtaGoYcvBdq5WYiK0cmeDwm8d0=</Hash>
+      <Hash>NzWhEbTccUIh1sSXIbU+8POVui0=</Hash>
       <Size>161326</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>audio.mxf</OriginalFileName>