From e63f408b80459c352c4e9a84a8fab99a1c22311a Mon Sep 17 00:00:00 2001
From: halleyscometsw <halleyscometsw@51a99a44-fe44-0410-b1ba-c3e57ba2b86b>
Date: Fri, 28 Aug 2009 20:10:50 +0000
Subject: [PATCH] remove extra checks from swd, add meta description, clean up
 some indenting

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@673 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
---
 src/meta/ngc_dsp_std.c |  4 +++
 src/vgmstream.c        | 63 ++++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/meta/ngc_dsp_std.c b/src/meta/ngc_dsp_std.c
index d7868a60..750d4ee0 100644
--- a/src/meta/ngc_dsp_std.c
+++ b/src/meta/ngc_dsp_std.c
@@ -1033,11 +1033,13 @@ VGMSTREAM * init_vgmstream_ngc_swd(STREAMFILE *streamFile) {
     start_offset = 0xC8;
     interleave = 0x8;
 
+#if 0
     /* check initial predictor/scale */
     if (ch0_header.initial_ps != (uint8_t)read_8bit(start_offset,streamFile))
         goto fail;
     if (ch1_header.initial_ps != (uint8_t)read_8bit(start_offset+interleave,streamFile))
         goto fail;
+#endif
 
     /* check type==0 and gain==0 */
     if (ch0_header.format || ch0_header.gain ||
@@ -1054,6 +1056,7 @@ VGMSTREAM * init_vgmstream_ngc_swd(STREAMFILE *streamFile) {
             ch0_header.loop_end_offset != ch1_header.loop_end_offset
        ) goto fail;
 
+#if 0
     if (ch0_header.loop_flag) {
         off_t loop_off;
         /* check loop predictor/scale */
@@ -1064,6 +1067,7 @@ VGMSTREAM * init_vgmstream_ngc_swd(STREAMFILE *streamFile) {
         if (ch1_header.loop_ps != (uint8_t)read_8bit(start_offset+loop_off+interleave,streamFile))
             goto fail;
     }
+#endif
 
     /* build the VGMSTREAM */
 
diff --git a/src/vgmstream.c b/src/vgmstream.c
index 438c4dc1..b6fa668d 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -2184,53 +2184,56 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             snprintf(temp,TEMPSIZE,"Gunvari MCG Header");
             break;
         case meta_ZSD:
-           snprintf(temp,TEMPSIZE,"ZSD Header");
-           break;
+            snprintf(temp,TEMPSIZE,"ZSD Header");
+            break;
         case meta_RedSpark:
-           snprintf(temp,TEMPSIZE,"RedSpark Header");
-           break;
+            snprintf(temp,TEMPSIZE,"RedSpark Header");
+            break;
         case meta_PC_IVAUD:
-           snprintf(temp,TEMPSIZE,"assumed GTA IV Audio file by .ivaud extension");
-           break;
+            snprintf(temp,TEMPSIZE,"assumed GTA IV Audio file by .ivaud extension");
+            break;
         case meta_DSP_WII_WSD:
-           snprintf(temp,TEMPSIZE,"Standard Nintendo DSP headers in .wsd");
-           break;
+            snprintf(temp,TEMPSIZE,"Standard Nintendo DSP headers in .wsd");
+            break;
         case meta_WII_NDP:
-           snprintf(temp,TEMPSIZE,"Vertigo NDP Header");
-           break;
+            snprintf(temp,TEMPSIZE,"Vertigo NDP Header");
+            break;
         case meta_PS2_SPS:
-           snprintf(temp,TEMPSIZE,"Ape Escape 2 SPS Header");
-           break;
+            snprintf(temp,TEMPSIZE,"Ape Escape 2 SPS Header");
+            break;
         case meta_PS2_XA2_RRP:
-           snprintf(temp,TEMPSIZE,"Acclaim XA2 Header");
-           break;
+            snprintf(temp,TEMPSIZE,"Acclaim XA2 Header");
+            break;
         case meta_NDS_HWAS:
-           snprintf(temp,TEMPSIZE,"NDS 'HWAS' Header");
-           break;
+            snprintf(temp,TEMPSIZE,"NDS 'HWAS' Header");
+            break;
 	    case meta_NGC_LPS:
-           snprintf(temp,TEMPSIZE,"Rave Master LPS Header");
-           break;
+            snprintf(temp,TEMPSIZE,"Rave Master LPS Header");
+            break;
         case meta_NAOMI_ADPCM:
-           snprintf(temp,TEMPSIZE,"NAOMI/NAOMI2 Arcade games ADPCM header");
-           break;
-		case meta_SD9:
-           snprintf(temp,TEMPSIZE,"beatmaniaIIDX SD9 header");
-           break;
+            snprintf(temp,TEMPSIZE,"NAOMI/NAOMI2 Arcade games ADPCM header");
+            break;
+        case meta_SD9:
+            snprintf(temp,TEMPSIZE,"beatmaniaIIDX SD9 header");
+            break;
 		case meta_2DX:
-           snprintf(temp,TEMPSIZE,"beatmaniaIIDX 2DX9 header");
-           break;
+            snprintf(temp,TEMPSIZE,"beatmaniaIIDX 2DX9 header");
+            break;
         case meta_DSP_YGO:
-           snprintf(temp,TEMPSIZE,"Yu-Gi-Oh! The Falsebound Kingdom DSP Header");
-           break;
+            snprintf(temp,TEMPSIZE,"Yu-Gi-Oh! The Falsebound Kingdom DSP Header");
+            break;
         case meta_PS2_VGV:
             snprintf(temp,TEMPSIZE,"Rune: Viking Warlord VGV Header");
-           break;
+            break;
         case meta_NGC_GCUB:
             snprintf(temp,TEMPSIZE,"Sega Soccer Slam GCub Header");
-           break;
+            break;
         case meta_NGC_SCK_DSP:
             snprintf(temp,TEMPSIZE,"The Scorpion King SCK Header");
-           break;
+            break;
+        case meta_NGC_SWD:
+            snprintf(temp,TEMPSIZE,"PSF + Standard DSP Headers");
+            break;
         default:
            snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
     }