Code cleanup.

source/3ds/cwav.cpp

@@ -3,6 +3,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+typedef enum {
+    PCM8,
+    PCM16,
+    TODO
+} CWAVType;
+
 typedef struct {
     char magic[4] = {'C', 'W', 'A', 'V'};
     u16 endianess = 0xFEFF;
@@ -17,7 +23,7 @@ typedef struct {
     u32 dataChunkOffset;
     u32 dataChunkLength;
     u8 reserved[0x14] = {0};
-} Header;
+} CWAVHeader;
 
 typedef struct {
     char magic[4] = {'I', 'N', 'F', 'O'};
@@ -28,12 +34,12 @@ typedef struct {
     u32 totalSamples;
     u32 unknown2 = 0;
     u32 totalChannels;
-} InfoHeader;
+} CWAVInfoHeader;
 
 typedef struct {
     u32 flags = 0x7100;
     u32 offset;
-} ChannelDataPointer;
+} CWAVChannelDataPointer;
 
 typedef struct {
     u32 flags = 0x1F00;
@@ -41,25 +47,25 @@ typedef struct {
     u32 unknown3 = 0;
     u32 unknown4 = 0;
     u32 padding = 0;
-} ChannelData;
+} CWAVChannelData;
 
 typedef struct {
     char magic[4] = {'D', 'A', 'T', 'A'};
     u32 length;
-} DataHeader;
+} CWAVDataHeader;
 
-u8* build_cwav(WAV wav, u32* size) {
-    Header header;
-    u32 offset = sizeof(Header);
+u8* cwav_build(CWAV cwav, u32* size) {
+    CWAVHeader header;
+    u32 offset = sizeof(CWAVHeader);
 
     header.infoChunkOffset = offset;
-    header.infoChunkLength = sizeof(InfoHeader);
+    header.infoChunkLength = sizeof(CWAVInfoHeader);
     offset += header.infoChunkLength;
 
-    offset += (sizeof(ChannelDataPointer) + sizeof(ChannelData)) * wav.format.numChannels;
+    offset += (sizeof(CWAVChannelDataPointer) + sizeof(CWAVChannelData)) * cwav.channels;
 
     header.dataChunkOffset = offset;
-    header.dataChunkLength = (u32) sizeof(DataHeader) + wav.data.chunkSize;
+    header.dataChunkLength = (u32) sizeof(CWAVDataHeader) + cwav.dataSize;
     offset += header.dataChunkLength;
 
     header.fileSize = offset;
@@ -67,45 +73,46 @@ u8* build_cwav(WAV wav, u32* size) {
     u8* output = (u8*) malloc(offset);
     u32 pos = 0;
 
-    memcpy(output + pos, &header, sizeof(Header));
-    pos += sizeof(Header);
+    memcpy(output + pos, &header, sizeof(CWAVHeader));
+    pos += sizeof(CWAVHeader);
 
-    InfoHeader infoHeader;
-    infoHeader.type = wav.format.bitsPerSample == 16 ? 1 : 0;
-    infoHeader.sampleRate = wav.format.sampleRate;
-    infoHeader.totalSamples = wav.data.chunkSize / (wav.format.bitsPerSample / 8) / wav.format.numChannels;
-    infoHeader.totalChannels = wav.format.numChannels;
-    memcpy(output + pos, &infoHeader, sizeof(InfoHeader));
-    pos += sizeof(InfoHeader);
+    u32 bytesPerSample = (u32) cwav.bitsPerSample / 8;
 
-    for(int i = 0; i < wav.format.numChannels; i++) {
-        ChannelDataPointer pointer;
-        pointer.offset = 0x4 + (wav.format.numChannels * (u32) sizeof(ChannelDataPointer)) + (i * (u32) sizeof(ChannelData));
-        memcpy(output + pos, &pointer, sizeof(ChannelDataPointer));
-        pos += sizeof(ChannelDataPointer);
+    CWAVInfoHeader infoHeader;
+    infoHeader.type = cwav.bitsPerSample == 16 ? PCM16 : PCM8;
+    infoHeader.sampleRate = cwav.sampleRate;
+    infoHeader.totalSamples = cwav.dataSize / bytesPerSample / cwav.channels;
+    infoHeader.totalChannels = cwav.channels;
+    memcpy(output + pos, &infoHeader, sizeof(CWAVInfoHeader));
+    pos += sizeof(CWAVInfoHeader);
+
+    for(int i = 0; i < cwav.channels; i++) {
+        CWAVChannelDataPointer pointer;
+        pointer.offset = 0x4 + (cwav.channels * (u32) sizeof(CWAVChannelDataPointer)) + (i * (u32) sizeof(CWAVChannelData));
+        memcpy(output + pos, &pointer, sizeof(CWAVChannelDataPointer));
+        pos += sizeof(CWAVChannelDataPointer);
     }
 
-    for(int i = 0; i < wav.format.numChannels; i++) {
-        ChannelData data;
-        data.offset = i * (wav.data.chunkSize / wav.format.numChannels);
-        memcpy(output + pos, &data, sizeof(ChannelData));
-        pos += sizeof(ChannelData);
+    u32 bytesPerChannel = cwav.dataSize / cwav.channels;
+    for(int i = 0; i < cwav.channels; i++) {
+        CWAVChannelData data;
+        data.offset = i * bytesPerChannel;
+        memcpy(output + pos, &data, sizeof(CWAVChannelData));
+        pos += sizeof(CWAVChannelData);
     }
 
-    DataHeader dataHeader;
-    dataHeader.length = (u32) sizeof(DataHeader) + wav.data.chunkSize;
-    memcpy(output + pos, &dataHeader, sizeof(DataHeader));
-    pos += sizeof(DataHeader);
+    CWAVDataHeader dataHeader;
+    dataHeader.length = (u32) sizeof(CWAVDataHeader) + cwav.dataSize;
+    memcpy(output + pos, &dataHeader, sizeof(CWAVDataHeader));
+    pos += sizeof(CWAVDataHeader);
 
-    u32 bytesPerChannel = wav.data.chunkSize / wav.format.numChannels;
-    u32 bytesPerSample = (u32) wav.format.bitsPerSample / 8;
-    for(int i = 0; i < wav.data.chunkSize; i += wav.format.numChannels * bytesPerSample) {
-        for(int c = 0; c < wav.format.numChannels; c++) {
-            memcpy(output + pos + (bytesPerChannel * c) + (i / wav.format.numChannels), wav.dataBytes + i + (c * bytesPerSample), bytesPerSample);
+    for(int i = 0; i < cwav.dataSize; i += cwav.channels * bytesPerSample) {
+        for(int c = 0; c < cwav.channels; c++) {
+            memcpy(output + pos + (bytesPerChannel * c) + (i / cwav.channels), cwav.data + i + (c * bytesPerSample), bytesPerSample);
         }
     }
 
-    pos += wav.data.chunkSize;
+    pos += cwav.dataSize;
 
     if(size != NULL) {
         *size = pos;