fix reading conditional chunks in the articulation data

Author: spessasus

src/soundbank/downloadable_sounds/articulation.ts

@@ -106,23 +106,21 @@ export class DownloadableSoundsArticulation extends DLSVerifier {
      * @param chunks
      */
     public read(chunks: RIFFChunk[]) {
-        const lart = RIFFChunk.findType(chunks, "lart");
-        const lar2 = RIFFChunk.findType(chunks, "lar2");
+        const lart = RIFFChunk.findListType(chunks, "lart");
+        const lar2 = RIFFChunk.findListType(chunks, "lar2");
 
         if (lart) {
             this.mode = "dls1";
             while (lart.data.currentIndex < lart.data.length) {
-                const art1 = RIFFChunk.read(lart.data);
+                const chunk = RIFFChunk.read(lart.data);
                 // Note:
                 // DLS Specification says that lar2 should only have art2, but a DirectMusic Producer example
                 // "FarmGame.dls" has 'art1' in there.
                 // Hence, we allow art2 in lart and art1 in lar2.
-                DownloadableSoundsArticulation.verifyHeader(
-                    art1,
-                    "art1",
-                    "art2"
-                );
-                const artData = art1.data;
+                if (chunk.header !== "art1" && chunk.header !== "art2")
+                    // There may be a cdl chunk, testcase romania_main.dls
+                    continue;
+                const artData = chunk.data;
                 const cbSize = readLittleEndianIndexed(artData, 4);
                 if (cbSize !== 8) {
                     SpessaSynthWarn(
@@ -137,17 +135,15 @@ export class DownloadableSoundsArticulation extends DLSVerifier {
         } else if (lar2) {
             this.mode = "dls2";
             while (lar2.data.currentIndex < lar2.data.length) {
-                const art2 = RIFFChunk.read(lar2.data);
+                const chunk = RIFFChunk.read(lar2.data);
                 // Note:
                 // DLS Specification says that lar2 should only have art2, but a DirectMusic Producer example
                 // "FarmGame.dls" has 'art1' in there.
                 // Hence, we allow art2 in lart and art1 in lar2.
-                DownloadableSoundsArticulation.verifyHeader(
-                    art2,
-                    "art2",
-                    "art1"
-                );
-                const artData = art2.data;
+                if (chunk.header !== "art1" && chunk.header !== "art2")
+                    // There may be a cdl chunk, testcase romania_main.dls
+                    continue;
+                const artData = chunk.data;
                 const cbSize = readLittleEndianIndexed(artData, 4);
                 if (cbSize !== 8) {
                     SpessaSynthWarn(

src/soundbank/downloadable_sounds/downloadable_sounds.ts

@@ -80,7 +80,7 @@ export class DownloadableSounds extends DLSVerifier {
         dls.soundBankInfo.comment = "(no description)";
 
         // Read info
-        const infoChunk = RIFFChunk.findType(chunks, "INFO");
+        const infoChunk = RIFFChunk.findListType(chunks, "INFO");
         if (infoChunk) {
             while (infoChunk.data.currentIndex < infoChunk.data.length) {
                 const infoPart = RIFFChunk.read(infoChunk.data);
@@ -148,7 +148,7 @@ export class DownloadableSounds extends DLSVerifier {
         );
 
         // Read the wave list
-        const waveListChunk = RIFFChunk.findType(chunks, "wvpl");
+        const waveListChunk = RIFFChunk.findListType(chunks, "wvpl");
         if (!waveListChunk) {
             this.parsingError("No wvpl chunk!");
             return 5 as never;
@@ -159,7 +159,7 @@ export class DownloadableSounds extends DLSVerifier {
         }
 
         // Read the instrument list
-        const instrumentListChunk = RIFFChunk.findType(chunks, "lins");
+        const instrumentListChunk = RIFFChunk.findListType(chunks, "lins");
         if (!instrumentListChunk) {
             this.parsingError("No lins chunk!");
             return 5 as never;

src/soundbank/downloadable_sounds/instrument.ts

@@ -77,7 +77,7 @@ export class DownloadableSoundsInstrument
 
         // Read the instrument name in INFO
         let instrumentName = ``;
-        const infoChunk = RIFFChunk.findType(chunks, "INFO");
+        const infoChunk = RIFFChunk.findListType(chunks, "INFO");
         if (infoChunk) {
             let info = RIFFChunk.read(infoChunk.data);
             while (info.header !== "INAM") {
@@ -122,7 +122,7 @@ export class DownloadableSoundsInstrument
         );
 
         // List of regions
-        const regionListChunk = RIFFChunk.findType(chunks, "lrgn");
+        const regionListChunk = RIFFChunk.findListType(chunks, "lrgn");
         if (!regionListChunk) {
             SpessaSynthGroupEnd();
             throw new Error("No region list!");

src/soundbank/downloadable_sounds/sample.ts

@@ -74,7 +74,7 @@ export class DownloadableSoundsSample extends DLSVerifier {
         );
 
         // Read sample name
-        const waveInfo = RIFFChunk.findType(chunks, "INFO");
+        const waveInfo = RIFFChunk.findListType(chunks, "INFO");
         if (waveInfo) {
             let infoChunk = RIFFChunk.read(waveInfo.data);
             while (

src/utils/riff_chunk.ts

@@ -195,7 +195,7 @@ export class RIFFChunk {
      * @remarks
      * Also skips the current index to after the list FourCC.
      */
-    public static findType(
+    public static findListType(
         collection: RIFFChunk[],
         type: FourCC
     ): RIFFChunk | undefined {