Change type Mixing to 4-byte integer

ullenius · Sep 16, 2021 · 29082c0 · 29082c0
1 parent 7383deb
commit 29082c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/SPCFormat_031.txt b/SPCFormat_031.txt
@@ -141,4 +141,4 @@ ID  Type    Size  Description
 33h Integer 4     Fade length
 34h Data    1     Muted voices (a bit is set for each voice that's muted)
 35h Data    1     Number of times to loop
-36h Data    1     Mixing (preamp) level
+36h Integer 4     Mixing (preamp) level
diff --git a/src/main/java/se/anosh/spctag/dao/Xid6Reader.java b/src/main/java/se/anosh/spctag/dao/Xid6Reader.java
@@ -39,7 +39,7 @@ public class Xid6Reader {
         mappningar.put((byte) 0x33, new Id("Fade length", Type.NUMBER));
         mappningar.put((byte) 0x34, new Id("Mutes voices", Type.MUTED)); // print bits
         mappningar.put((byte) 0x35, new Id("Number of times to loop", Type.DATA));
-        mappningar.put((byte) 0x36, new Id("Mixing (preamp) level", Type.DATA));
+        mappningar.put((byte) 0x36, new Id("Mixing (preamp) level", Type.NUMBER));
     }
 
     public static void main(String[] args) throws IOException {
@@ -57,9 +57,10 @@ public List<Path> listFilesUsingFilesList(String dir) throws IOException {
     }
 
     private void mappedVersion() throws IOException {
-   
+
         System.out.println("Size of set: " + files.size());
         List<Byte> unknownMappings = new LinkedList<>();
+        List<String> unknownMappingfiles = new LinkedList<>();
         List<String> filesWith20Tag = new LinkedList<>();
 
         final long offset = 0x10200;
@@ -94,13 +95,11 @@ private void mappedVersion() throws IOException {
             int tmp = buffer.getInt();
             final int chunkSize = (tmp > xid6SizeMinusHeader) ? (int) xid6SizeMinusHeader : tmp;
 
-            System.out.println("Filesize minus header = " + xid6SizeMinusHeader);
-
             System.out.println("Chunk size: " + chunkSize);
             System.out.println("Current pos: " + buffer.position());
 
             byte[] subChunkArr = new byte[chunkSize]; // chunkSize exclusive header
-            buffer.get(subChunkArr); // innehåller alla sub-chunks, med sub-chunk headers
+            buffer.get(subChunkArr); // contains all sub-chunks, including sub-chunk headers
             var subChunks = ByteBuffer.wrap(subChunkArr).order(ByteOrder.LITTLE_ENDIAN); // FIXME felaktigt namn, är hela subchunken
 
             System.out.println("Subchunk contents");
@@ -112,20 +111,17 @@ private void mappedVersion() throws IOException {
                 byte id = subChunks.get();
                 if (!mappningar.containsKey(id)) {
                     unknownMappings.add(id);
+                    unknownMappingfiles.add(spc.getFileName().toString());
                     if (id == (byte)0x20) {
                         filesWith20Tag.add(spc.getFileName() + " har 0x20-taggen");
                     }
                     //throw new IllegalArgumentException("No mapping found for id: 0x" + toHexString(id));
-                    break;
+                    break; // continue?
                 }
                 Id mappatId = mappningar.get(id);
                 Type type = mappatId.type;
 
                 boolean dataStoredInHeader = subChunks.get() == 0 || type == Type.DATA; // workaround for broken type byte, always read from header
-               // if (!dataStoredInHeader && type == Type.DATA) {
-              //      dataStoredInHeader = true;
-                    //throw new IllegalArgumentException("1 byte data not stored in header: " + spc);
-             //   }
 
                 System.out.println("Id: 0x" + toHexString(id));
                 System.out.println("Mappat id: " + mappatId);
@@ -221,6 +217,8 @@ private void mappedVersion() throws IOException {
         }
         System.out.println("Unknown mappings: " + unknownMappings);
         System.out.println("Files with 0x20: " + filesWith20Tag);
+        Collections.sort(unknownMappingfiles);
+        System.out.println("Files with unkown mappings " + unknownMappingfiles);
     }
 
     private static short toShort(byte buf[]) { // little endian