From 70df3651faf99ed9cab39300ab66043d87e33269 Mon Sep 17 00:00:00 2001
From: snakemeat <snakemeat@51a99a44-fe44-0410-b1ba-c3e57ba2b86b>
Date: Sat, 14 Apr 2012 16:07:21 +0000
Subject: [PATCH] Add PS3 IVAG meta.

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@977 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
---
 fb2k/in_vgmstream.cpp     | 2 ++
 src/Makefile              | 3 ++-
 src/libvgmstream.vcproj   | 4 ++++
 src/meta/Makefile.unix.am | 1 +
 src/meta/meta.h           | 2 ++
 src/vgmstream.c           | 4 ++++
 src/vgmstream.h           | 1 +
 unix/data.c               | 1 +
 winamp/in_vgmstream.c     | 1 +
 9 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/fb2k/in_vgmstream.cpp b/fb2k/in_vgmstream.cpp
index 3ec74bf6..00466123 100644
--- a/fb2k/in_vgmstream.cpp
+++ b/fb2k/in_vgmstream.cpp
@@ -356,6 +356,7 @@ bool input_vgmstream::g_is_our_path(const char * p_path,const char * p_extension
 	if(!stricmp_utf8(p_extension,"isd")) return 1;
 	if(!stricmp_utf8(p_extension,"isws")) return 1;
 	if(!stricmp_utf8(p_extension,"ivaud")) return 1;
+	if(!stricmp_utf8(p_extension,"ivag")) return 1;
 	if(!stricmp_utf8(p_extension,"ivb")) return 1;
 
 	if(!stricmp_utf8(p_extension,"joe")) return 1;
@@ -668,6 +669,7 @@ DECLARE_MULTIPLE_FILE_TYPE("PS2 RAW Interleaved PCM (*.INT)", int);
 DECLARE_MULTIPLE_FILE_TYPE("ISD Audio File (*.ISD)", isd);
 DECLARE_MULTIPLE_FILE_TYPE("ISWS Audio File (*.ISWS)", isws);
 DECLARE_MULTIPLE_FILE_TYPE("IVAUD Audio File (*.IVAUD)", ivaud);
+DECLARE_MULTIPLE_FILE_TYPE("IVAG Audio File (*.IVAG)", ivag);
 DECLARE_MULTIPLE_FILE_TYPE("IVB Audio File (*.IVB)", ivb);
 
 DECLARE_MULTIPLE_FILE_TYPE("JOE Audio File (*.JOE)", joe);
diff --git a/src/Makefile b/src/Makefile
index 8719c585..7ad8cefb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -285,7 +285,8 @@ META_OBJS=meta/adx_header.o \
     meta/wpd.o \
     meta/mn_str.o \
     meta/ps2_mss.o \
-    meta/ps2_hsf.o
+    meta/ps2_hsf.o \
+    meta/ps3_ivag.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index e447290e..bfcb0245 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -874,6 +874,10 @@
 					RelativePath=".\meta\ps3_cps.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ps3_ivag.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ps3_klbs.c"
 					>
diff --git a/src/meta/Makefile.unix.am b/src/meta/Makefile.unix.am
index 47f2ae9a..86d28e5a 100644
--- a/src/meta/Makefile.unix.am
+++ b/src/meta/Makefile.unix.am
@@ -232,5 +232,6 @@ libmeta_la_SOURCES += wpd.c
 libmeta_la_SOURCES += mn_str.c
 libmeta_la_SOURCES += ps2_mss.c
 libmeta_la_SOURCES += ps2_hsf.c
+libmeta_la_SOURCES += ps3_ivag.c
 
 EXTRA_DIST = meta.h
diff --git a/src/meta/meta.h b/src/meta/meta.h
index 4804503c..384cc9e2 100644
--- a/src/meta/meta.h
+++ b/src/meta/meta.h
@@ -606,4 +606,6 @@ VGMSTREAM * init_vgmstream_ps2_mss(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_hsf(STREAMFILE* streamFile);
 
+VGMSTREAM * init_vgmstream_ps3_ivag(STREAMFILE* streamFile);
+
 #endif
diff --git a/src/vgmstream.c b/src/vgmstream.c
index 33827e7b..371050a2 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -316,6 +316,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_mn_str,
 	init_vgmstream_ps2_mss,
 	init_vgmstream_ps2_hsf,
+	init_vgmstream_ps3_ivag,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -2881,6 +2882,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             break;
 		case meta_PS2_HSF:
             snprintf(temp,TEMPSIZE,"Lowrider 'HSF' header");
+            break;
+		case meta_PS3_IVAG:
+            snprintf(temp,TEMPSIZE,"PS3 'IVAG' Header");
             break;
 		default:
            snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
diff --git a/src/vgmstream.h b/src/vgmstream.h
index 3c383286..62ac78fd 100644
--- a/src/vgmstream.h
+++ b/src/vgmstream.h
@@ -530,6 +530,7 @@ typedef enum {
 	meta_MN_STR,            // Mini Ninjas (PC/PS3/WII)
 	meta_PS2_MSS,			// ShellShock Nam '67 (PS2)
 	meta_PS2_HSF,			// Lowrider (PS2)
+	meta_PS3_IVAG,			// Interleaved VAG files (PS3)
 } meta_t;
 
 typedef struct {
diff --git a/unix/data.c b/unix/data.c
index 0f726372..d8d2da3a 100644
--- a/unix/data.c
+++ b/unix/data.c
@@ -102,6 +102,7 @@ gchar *vgmstream_exts [] = {
   "int",
   "isd",
   "ivaud",
+  "ivag",
   "ivb",
 
   "joe",
diff --git a/winamp/in_vgmstream.c b/winamp/in_vgmstream.c
index d29a9bff..7c6ca7a7 100644
--- a/winamp/in_vgmstream.c
+++ b/winamp/in_vgmstream.c
@@ -170,6 +170,7 @@ char * extension_list[] = {
     "isd\0ISD Audio File (*.ISD)\0",
     "isws\0ISWS Audio File (*.ISWS)\0",
     "ivaud\0IVAUD Audio File (*.IVAUD)\0",
+    "ivag\0IVAG Audio File (*.IVAG)\0",
     "ivb\0IVB Audio File (*.IVB)\0",
 
     "joe\0JOE Audio File (*.JOE)\0",