add support for Gunvari MCG Audio Files

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@602 51a99a44-fe44-0410-b1ba-c3e57ba2b86b

src/Makefile

@@ -185,7 +185,8 @@ META_OBJS=meta/adx_header.o \
     meta/ps2_tk5.o \
     meta/ads.o \
     meta/wii_str.o \
-    meta/zsd.o
+    meta/zsd.o \
+    meta/ps2_mcg.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/libvgmstream.vcproj

@@ -510,6 +510,10 @@
 					RelativePath=".\meta\ps2_leg.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ps2_mcg.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ps2_mib.c"
 					>

src/meta/Makefile.unix.am

@@ -146,5 +146,6 @@ libmeta_la_SOURCES += ps2_tk5.c
 libmeta_la_SOURCES += ads.c
 libmeta_la_SOURCES += wii_str.c
 libmeta_la_SOURCES += zsd.c
+libmeta_la_SOURCES += ps2_mcg.c
 
 EXTRA_DIST = meta.h

src/meta/meta.h

@@ -355,6 +355,8 @@ VGMSTREAM * init_vgmstream_ads(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_wii_str(STREAMFILE *streamFile);
 
+VGMSTREAM * init_vgmstream_ps2_mcg(STREAMFILE *streamFile);
+
 VGMSTREAM * init_vgmstream_zsd(STREAMFILE *streamFile);
 
 #endif

src/meta/ps2_mcg.c

@@ -0,0 +1,67 @@
+#include "meta.h"
+#include "../util.h"
+
+/* GUN (Gunvari Streams) */
+VGMSTREAM * init_vgmstream_ps2_mcg(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+    off_t start_offset;
+    int loop_flag = 0;
+	int channel_count;
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("mcg",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (!((read_32bitBE(0x00,streamFile) == 0x4D434700) && 
+         (read_32bitBE(0x20,streamFile) == 0x56414770) && 
+	     (read_32bitBE(0x50,streamFile) == 0x56414770)))
+        goto fail;
+
+	loop_flag = (read_32bitLE(0x34,streamFile)!=0);
+    channel_count = 2;
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+	start_offset = 0x80;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitBE(0x30,streamFile);
+    vgmstream->coding_type = coding_PSX;
+	vgmstream->num_samples = read_32bitBE(0x2C,streamFile)*2;
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x14,streamFile);
+    vgmstream->meta_type = meta_PS2_MCG;
+
+	if (vgmstream->loop_flag) 
+	{
+		vgmstream->loop_start_sample = read_32bitLE(0x34,streamFile);
+		vgmstream->loop_end_sample = vgmstream->num_samples;
+	}
+
+    /* 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;
+
+    /* clean up anything we may have opened */
+fail:
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}

src/vgmstream.c

@@ -197,6 +197,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_ps2_vsf_tta,
 	init_vgmstream_ads,
 	init_vgmstream_wii_str,
+	init_vgmstream_ps2_mcg,
     init_vgmstream_zsd,
 };
 
@@ -2101,14 +2102,19 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
 	   case meta_ADS:
             snprintf(temp,TEMPSIZE,"dhSS Header");
             break;
+	   case meta_WII_STR:
        case meta_WII_STR:
 		   snprintf(temp,TEMPSIZE,"HOTD Overkill - STR+STH WII Header");
             break;
+	   case meta_PS2_MCG:
+		    snprintf(temp,TEMPSIZE,"Gunvari MCG Header");
+            break;
        case meta_ZSD:
            snprintf(temp,TEMPSIZE,"ZSD Header");
            break;
        default:
            snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
+           break;
     }
     concatn(length,desc,temp);
 }

src/vgmstream.h

@@ -376,6 +376,7 @@ typedef enum {
     meta_NGC_IADP,			/* Gamecube Interleave DSP */
 	meta_PS2_TK5,			/* Tekken 5 Stream Files */
 	meta_WII_STR,			/* House of The Dead Overkill STR+STH */
+	meta_PS2_MCG,			/* Gunvari MCG  Files (was name .GCM on disk) */
     meta_ZSD,               /* Dragon Booster ZSD */
 } meta_t;
 

winamp/in_vgmstream.c

@@ -229,6 +229,7 @@ char * extension_list[] = {
 	"vb\0VB Audio File (*.VB)\0",
 	"tk5\0TK5 Audio File (*.TK5)\0",
 	"rrds\0RRDS Audio File (*.RRDS)\0",
+	"mcg\0MCG Audio File (*.MCG)\0",
     "zsd\0ZSD Audio File (*.ZSD)\0",
 };