fix xa2 missing file

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

src/libvgmstream.vcproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="libvgmstream"
 	ProjectGUID="{54A6AD11-5369-4895-A06F-E255ABB99B11}"
 	RootNamespace="libvgmstream"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -17,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\Program Files\winamp\plugins"
+			OutputDirectory="C:\AppVista\Media\Winamp\Plugins"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			>
@@ -488,6 +489,10 @@
 					RelativePath=".\meta\ps2_vpk.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ps2_xa2.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ps2_xa30.c"
 					>

src/meta/ps2_xa2.c

@@ -0,0 +1,60 @@
+#include "meta.h"
+#include "../util.h"
+
+/* XA2 (XG3 Extreme-G Racing) */
+VGMSTREAM * init_vgmstream_ps2_xa2(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("xa2",filename_extension(filename))) goto fail;
+
+    loop_flag = (read_32bitLE(0x10,streamFile)!=0);
+    channel_count = read_32bitLE(0x0,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = 0x800;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = 44100;
+    vgmstream->coding_type = coding_PSX;
+    vgmstream->num_samples = read_32bitLE(0x0C,streamFile);
+    if (loop_flag) {
+        vgmstream->loop_start_sample = vgmstream->num_samples-read_32bitLE(0x08,streamFile);
+        vgmstream->loop_end_sample = vgmstream->num_samples;
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x04,streamFile);
+    vgmstream->meta_type = meta_PS2_XA2;
+
+    /* 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;
+
+        }
+    }
+
+    return vgmstream;
+
+    /* clean up anything we may have opened */
+fail:
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}

winamp/in_vgmstream.c

@@ -71,7 +71,7 @@ int decode_pos_samples = 0;
 int stream_length_samples = 0;
 int fade_samples = 0;
 
-#define EXTENSION_LIST_SIZE 3072
+#define EXTENSION_LIST_SIZE 4096
 char working_extension_list[EXTENSION_LIST_SIZE] = {0};
 char * extension_list[] = {
     "adx\0ADX Audio File (*.ADX)\0",
@@ -181,6 +181,8 @@ char * extension_list[] = {
 	"idvi\0IDVI Audio File (*.IDVI)\0",
 	"rnd\0RND Audio File (*.RND)\0",
 	"kraw\0KRAW Audio File (*.KRAW)\0",
+	"omu\0OMU Audio File (*.OMU)\0",
+	"xa2\0XA2 Audio File (*.XA2)\0",
 };
 
 void about(HWND hwndParent) {

winamp/resource.rc

@@ -1,5 +1,7 @@
 #include "resource.h"
-#include "afxres.h"
+//#include "afxres.h"
+#include <windows.h>
+#define IDC_STATIC -1
 
 IDD_CONFIG DIALOGEX 0, 0, 187, 144
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU