From 65d1a32ad548f3deb1bb3cfb49c7355b24d48f95 Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Sun, 16 Mar 2014 20:36:50 -0700
Subject: [PATCH] Added missing file to the repository and fixed a serious
 crash bug handling .vb files

---
 Frameworks/vgmstream/vgmstream/src/meta/2dx.c | 69 +++++++++++++++++++
 .../vgmstream/vgmstream/src/meta/ps2_mib.c    |  4 +-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 Frameworks/vgmstream/vgmstream/src/meta/2dx.c

diff --git a/Frameworks/vgmstream/vgmstream/src/meta/2dx.c b/Frameworks/vgmstream/vgmstream/src/meta/2dx.c
new file mode 100644
index 000000000..ebe39903a
--- /dev/null
+++ b/Frameworks/vgmstream/vgmstream/src/meta/2dx.c
@@ -0,0 +1,69 @@
+#include "meta.h"
+#include "../util.h"
+
+/* 2DX (found in beatmaniaIIDX16 - EMPRESS (Arcade) */
+VGMSTREAM * init_vgmstream_2dx(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[PATH_LIMIT];
+    off_t start_offset;
+
+	int loop_flag;
+	int channel_count;
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("2dx",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x0,streamFile) != 0x32445839) /* 2DX9 */
+		goto fail;
+	if (read_32bitBE(0x18,streamFile) != 0x52494646) /* RIFF */
+		goto fail;
+	if (read_32bitBE(0x20,streamFile) != 0x57415645) /* WAVE */
+		goto fail;
+	if (read_32bitBE(0x24,streamFile) != 0x666D7420) /* fmt */
+		goto fail;
+    if (read_32bitBE(0x6a,streamFile) != 0x64617461) /* data */
+		goto fail;
+
+    loop_flag = 0;
+    channel_count = read_16bitLE(0x2e,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = 0x72;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitLE(0x30,streamFile);
+    vgmstream->coding_type = coding_MSADPCM;
+    vgmstream->num_samples = read_32bitLE(0x66,streamFile);
+    vgmstream->layout_type = layout_none;
+	vgmstream->interleave_block_size = read_16bitLE(0x38,streamFile);
+    vgmstream->meta_type = meta_2DX;
+
+    /* open the file for reading */
+    {
+        int i;
+        STREAMFILE * file;
+        file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
+        if (!file) goto fail;
+        for (i=0;i<channel_count;i++) {
+            vgmstream->ch[i].streamfile = file;
+
+            vgmstream->ch[i].channel_start_offset=
+                vgmstream->ch[i].offset=start_offset+
+                vgmstream->interleave_block_size*i;
+
+        }
+    }
+
+    
+	return vgmstream;
+
+fail:
+    /* clean up anything we may have opened */
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}
diff --git a/Frameworks/vgmstream/vgmstream/src/meta/ps2_mib.c b/Frameworks/vgmstream/vgmstream/src/meta/ps2_mib.c
index 26b669a22..4d3ff3180 100644
--- a/Frameworks/vgmstream/vgmstream/src/meta/ps2_mib.c
+++ b/Frameworks/vgmstream/vgmstream/src/meta/ps2_mib.c
@@ -274,8 +274,8 @@ VGMSTREAM * init_vgmstream_ps2_mib(STREAMFILE *streamFile) {
 			vgmstream->interleave_block_size=0;
 			vgmstream->sample_rate = 22050;
 			vgmstream->channels = 1;
-			vgmstream->start_ch = 1;
-			vgmstream->loop_ch = 1;
+			/*vgmstream->start_ch = 1; XXX what the hell?
+			vgmstream->loop_ch = 1;*/
 		}
 
 		vgmstream->num_samples = (int32_t)(fileLength/16/channel_count*28);