Changeset 90277 in vbox for trunk/src/VBox/Storage/CUE.cpp

Timestamp:

Jul 21, 2021 8:40:29 PM (3 years ago)

Author:

vboxsync

Message:

Storage/CUE: Fix support for the MOTOROLA variant of a CUE sheet and ignore TITLE directives between FILE and the start of the track list (based on the patch submitted by Dennis Borde, thanks!)

File:

• trunk/src/VBox/Storage/CUE.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/CUE.cpp

@@ -238 +238 @@
     {RT_STR_TUPLE("FILE"),       CUEKEYWORD_FILE},
     {RT_STR_TUPLE("BINARY"),     CUEKEYWORD_BINARY},
+    {RT_STR_TUPLE("MOTOROLA"),   CUEKEYWORD_MOTOROLA},
     {RT_STR_TUPLE("WAVE"),       CUEKEYWORD_WAVE},
     {RT_STR_TUPLE("MP3"),        CUEKEYWORD_MP3},
@@ -1040 +1041 @@
     int rc = VINF_SUCCESS;
 
+    /*
+     * Sometimes there is a TITLE/PERFORMER/SONGWRITER directive before the start of the track list,
+     * skip and ignore those.
+     */
+    while (   RT_SUCCESS(rc)
+           && (   cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_TITLE)
+               || cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_PERFORMER)
+               || cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_SONGWRITER)))
+        rc = cueParseAndSkipStringRemainder(pThis, pTokenizer, "TITLE/PERFORMER/SONGWRITER");
+
     while (   RT_SUCCESS(rc)
            && cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_TRACK))
@@ -1108 +1119 @@
     if (cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_FILE))
         rc = cueParseFile(pThis, pTokenizer);
-    else if (cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_TITLE))
-        rc = cueParseAndSkipStringRemainder(pThis, pTokenizer, "TITLE");
-    else if (cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_PERFORMER))
-        rc = cueParseAndSkipStringRemainder(pThis, pTokenizer, "PERFORMER");
-    else if (cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_SONGWRITER))
-        rc = cueParseAndSkipStringRemainder(pThis, pTokenizer, "SONGWRITER");
     else /* Skip all other keywords we don't need/support. */
         cueTokenizerConsume(pTokenizer);
@@ -1541 +1546 @@
         /* Need to convert audio data samples to big endian. */
         if (   pRegion->enmDataForm == VDREGIONDATAFORM_CDDA
-            && pThis->fLittleEndian)
+            && !pThis->fLittleEndian)
         {
             *pcbActuallyRead = cbToRead;