diff --git a/doc/FORMATS.md b/doc/FORMATS.md
index 28cc1d8d..6a95cf82 100644
--- a/doc/FORMATS.md
+++ b/doc/FORMATS.md
@@ -25,9 +25,9 @@ different internally (encrypted, different versions, etc) and not always can be
### List
- **adx.c**
- - CRI ADX header type 03 [*ADX_03*]
- - CRI ADX header type 04 [*ADX_04*]
- - CRI ADX header type 05 [*ADX_05*]
+ - CRI ADX header (type 03) [*ADX_03*]
+ - CRI ADX header (type 04) [*ADX_04*]
+ - CRI ADX header (type 05) [*ADX_05*]
- *adx*
- Subfiles: *adx_subkey*
- *adx_subkey*: `.adx .adp + .(external)`
@@ -198,7 +198,7 @@ different internally (encrypted, different versions, etc) and not always can be
- Codecs: NGC_DSP
- **ea_schl.c**
- Electronic Arts BNK header [*EA_BNK*]
- - Electronic Arts SCHl header (variable) [*EA_SCHL*]
+ - Electronic Arts SCHl header [*EA_SCHL*]
- *ea_schl*: `.asf .lasf .str .chk .eam .exa .sng .aud .sx .xa .strm .stm .hab .xsf .gsf .(extensionless)`
- *ea_schl_video*: `.uv .dct .mad .wve .vp6`
- *ea_bnk*: `.bnk .sdt .hdt .ldt .abk .ast`
@@ -239,8 +239,8 @@ different internally (encrypted, different versions, etc) and not always can be
- *wsi*: `.wsi`
- Codecs: NGC_DSP
- **aifc.c**
- - Apple AIFF-C (Audio Interchange File Format) header [*AIFC*]
- - Apple AIFF (Audio Interchange File Format) header [*AIFF*]
+ - Apple AIFF-C header [*AIFC*]
+ - Apple AIFF header [*AIFF*]
- *aifc*: `.aif .laif .wav .lwav .(extensionless) .aifc .laifc .afc .cbd2 .bgm .fda .n64 .xa .aiff .laiff .acm .adp .ai .pcm`
- Codecs: SDX2 CBD2 DVI_IMA_int APPLE_IMA4 RELIC VADPCM PCM8 PCM16BE XA
- **str_snds.c**
@@ -265,12 +265,12 @@ different internally (encrypted, different versions, etc) and not always can be
- Codecs: PSX
- **riff.c**
- RIFF WAVE header [*RIFF_WAVE*]
- - RIFF WAVE header with loop markers [*RIFF_WAVE_labl*]
- - RIFF WAVE header with sample looping info [*RIFF_WAVE_smpl*]
- - RIFF WAVE header with wsmp looping info [*RIFF_WAVE_wsmp*]
- - RIFF WAVE header with .mwv flavoring [*RIFF_WAVE_MWV*]
+ - RIFF WAVE header (labl looping) [*RIFF_WAVE_labl*]
+ - RIFF WAVE header (smpl looping) [*RIFF_WAVE_smpl*]
+ - RIFF WAVE header (wsmp looping) [*RIFF_WAVE_wsmp*]
+ - RIFF WAVE header (ctrl looping) [*RIFF_WAVE_MWV*]
- RIFX WAVE header [*RIFX_WAVE*]
- - RIFX WAVE header with sample looping info [*RIFX_WAVE_smpl*]
+ - RIFX WAVE header (smpl looping) [*RIFX_WAVE_smpl*]
- *riff*: `.wav .lwav .xwav .mwv .da .dax .cd .med .snd .adx .adp .xss .xsew .adpcm .adw .wd .(extensionless) .sbv .wvx .str .at3 .rws .aud .at9 .ckd .saf .ima .nsa .pcm .xvag .ogg .logg .p1d .xms .mus .dat .ldat`
- *rifx*: `.wav .lwav`
- Codecs: AICA_int PCM24LE PCM16BE PCM16LE PCM8_U MSADPCM IMA MS_IMA AICA MPEG_custom XBOX_IMA MS_IMA_3BIT DVI_IMA L5_555 OGG_VORBIS ATRAC9 ATRAC3 MPEG MSADPCM_int
@@ -290,13 +290,13 @@ different internally (encrypted, different versions, etc) and not always can be
- Dino Crisis 3 XSS File [*XSS*]
- *xss*: `.xss`
- Codecs: PCM16LE
-- **ps2_sl3.c**
+- **sl3.c**
- Atari Melbourne House SL3 header [*SL3*]
- - *sl3*: `.ms .sl3`
+ - *sl3*: `.ms`
- Codecs: PSX
-- **ps2_hgc1.c**
- - Knights of the Temple 2 hgC1 Header [*HGC1*]
- - *hgc1*: `.hgc1`
+- **hgc1.c**
+ - Cauldron HGC1 header [*HGC1*]
+ - *hgc1*: `.str`
- Codecs: PSX
- **aus.c**
- Capcom AUS Header [*AUS*]
@@ -340,9 +340,9 @@ different internally (encrypted, different versions, etc) and not always can be
- Eurocom MUSX header [*MUSX*]
- *musx*: `.sfx .musx`
- Codecs: PSX DAT4_IMA DVI_IMA_int XBOX_IMA NGC_DSP PCM16BE PCM16LE
-- **ps2_filp.c**
- - Bio Hazard - Gun Survivor FILp Header [*FILP*]
- - *filp*: `.filp`
+- **filp.c**
+ - cavia FILp Header [*FILP*]
+ - *filp*: `.fil`
- Codecs: PSX
- **ikm.c**
- MiCROViSiON IKM header [*IKM*]
@@ -356,16 +356,16 @@ different internally (encrypted, different versions, etc) and not always can be
- ALCHEMY STER header [*STER*]
- *ster*: `.ster .sfs`
- Codecs: PSX
-- **ps2_bg00.c**
- - Falcom BG00 Header [*BG00*]
+- **bg00.c**
+ - Cave BG00 header [*BG00*]
- *bg00*: `.bg00`
- Codecs: PSX
- **sat_dvi.c**
- - Konami KCEN DVI. header [*SAT_DVI*]
+ - Konami DVI. header [*SAT_DVI*]
- *sat_dvi*: `.pcm .dvi`
- Codecs: DVI_IMA_int
- **dc_kcey.c**
- - Konami KCEY KCEYCOMP header [*DC_KCEY*]
+ - Konami KCEY header [*DC_KCEY*]
- *dc_kcey*: `.pcm .kcey`
- Codecs: DVI_IMA
- **rstm_rockstar.c**
@@ -393,7 +393,7 @@ different internally (encrypted, different versions, etc) and not always can be
- *vsv*: `.vsv .psh`
- Codecs: PSX
- **ps2_pcm.c**
- - Konami KCEJ East .PCM header [*PS2_PCM*]
+ - Konami .PCM header [*PS2_PCM*]
- *ps2_pcm*: `.pcm`
- Codecs: PCM16LE
- **rkv.c**
@@ -429,12 +429,8 @@ different internally (encrypted, different versions, etc) and not always can be
- *wvs_xbox*: `.wvs`
- *wvs_ngc*: `.wvs`
- Codecs: XBOX_IMA NGC_DSP
-- **xbox_ims.c**
- - assumed Matrix file by .matx extension [*XBOX_MATX*]
- - *xbox_matx*: `.matx`
- - Codecs: XBOX_IMA
- **dec.c**
- - Falcom DEC RIFF header [*DEC*]
+ - Falcom .DEC RIFF header [*DEC*]
- *dec*: `.dec .de2 + .(external)`
- Codecs: MSADPCM
- **vs.c**
@@ -464,7 +460,7 @@ different internally (encrypted, different versions, etc) and not always can be
- *dc_idvi*: `.dvi .idvi`
- Codecs: DVI_IMA_int
- **ps2_rnd.c**
- - Knights of the Temple 2 hgC1 Header [*HGC1*]
+ - Cauldron HGC1 header [*HGC1*]
- *ps2_rnd*: `.rnd`
- Codecs: PSX
- **kraw.c**
@@ -504,9 +500,9 @@ different internally (encrypted, different versions, etc) and not always can be
- *ngc_pdt*: `.pdt`
- *ngc_pdt_split*: `.pdt`
- Codecs: NGC_DSP
-- **wii_mus.c**
- - mus header [*DSP_WII_MUS*]
- - *wii_mus*: `.mus`
+- **mus_krone.c**
+ - Krone .MUS header [*MUS_KRONE*]
+ - *mus_krone*: `.mus`
- Codecs: NGC_DSP
- **dc_asd.c**
- ASD Header [*DC_ASD*]
@@ -563,8 +559,8 @@ different internally (encrypted, different versions, etc) and not always can be
- *ish_isd*: `.isd + .ish`
- Codecs: NGC_DSP
- **gsp_gsb.c**
- - Tecmo GSP+GSB Header [*GSP_GSB*]
- - *gsp_gsb*: `.gsb + .gsp`
+ - Tecmo GSND Header [*GSND*]
+ - *gsnd*: `.gsp + .gsb`
- Codecs: NGC_DSP ATRAC3 XMA
- **ydsp.c**
- Yuke's YDSP Header [*YDSP*]
@@ -730,9 +726,9 @@ different internally (encrypted, different versions, etc) and not always can be
- Sensaura SAB header [*SAB*]
- *sab*: `.sab + .sob`
- Codecs: PCM16LE PSX XBOX_IMA
-- **wii_bns.c**
- - Nintendo BNS header [*WII_BNS*]
- - *wii_bns*: `.bin .lbin .bns`
+- **bns.c**
+ - Nintendo BNS header [*BNS*]
+ - *bns*: `.bin .lbin .bns`
- Codecs: NGC_DSP
- **pona.c**
- Policenauts BGM header [*PONA_3DO*]
@@ -771,9 +767,9 @@ different internally (encrypted, different versions, etc) and not always can be
- Konami DSP header [*NGC_DSP_KONAMI*]
- *ngc_dsp_konami*: `.dsp`
- Codecs: NGC_DSP
-- **ps2_wb.c**
- - Shooting Love. ~TRIZEAL~ WB header [*PS2_WB*]
- - *ps2_wb*: `.wb`
+- **wb.c**
+ - Triangle Service .WB header [*WB*]
+ - *wb*: `.wb`
- Codecs: PCM16LE
- **bnsf.c**
- Namco Bandai BNSF header [*BNSF*]
@@ -811,10 +807,6 @@ different internally (encrypted, different versions, etc) and not always can be
- B1S header [*PS2_B1S*]
- *ps2_b1s*: `.b1s`
- Codecs: PSX
-- **ps2_wad.c**
- - WAD header [*PS2_WAD*]
- - *ps2_wad*: `.wad`
- - Codecs: PSX
- **lpcm_shade.c**
- Shade LPCM header [*LPCM_SHADE*]
- *lpcm_shade*: `.w .lpcm`
@@ -952,7 +944,7 @@ different internally (encrypted, different versions, etc) and not always can be
- *ps2_2pfs*: `.sap .2pfs`
- Codecs: PSX
- **xnb.c**
- - Microsoft XNA Game Studio 4.0 header [*XNB*]
+ - Microsoft XNA Game Studio header [*XNB*]
- *xnb*: `.xnb + .(external)`
- Subfiles: *ogg_vorbis riff opus_std ffmpeg*
- Codecs: PCM8_U PCM16LE MSADPCM MS_IMA XMA2 NGC_DSP
@@ -1830,7 +1822,7 @@ different internally (encrypted, different versions, etc) and not always can be
- *tgc*: `.4`
- Codecs: TGC
- **pos.c**
- - RIFF WAVE header and .pos for looping [*RIFF_WAVE_POS*]
+ - RIFF WAVE header (.pos looping) [*RIFF_WAVE_POS*]
- *pos*: `.pos + .wav`
- Subfiles: *riff*
- **sli.c**
@@ -1838,7 +1830,7 @@ different internally (encrypted, different versions, etc) and not always can be
- *sli_loops*: `.sli + .(external)`
- Subfiles: *ogg_opus ogg_vorbis riff*
- **ngc_adpdtk.c**
- - Nintendo DTK raw header [*DTK*]
+ - Nintendo .DTK raw header [*DTK*]
- *dtk*: `.dtk .adp .trk .wav .lwav`
- Codecs: NGC_DTK
- **mpeg.c**
diff --git a/src/formats.c b/src/formats.c
index 6d3bb998..c4f0d24b 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -1150,7 +1150,7 @@ static const meta_info meta_info_list[] = {
{meta_SAB, "Sensaura SAB header"},
{meta_MAXIS_XA, "Maxis XA Header"},
{meta_EXAKT_SC, "assumed Activision / EXAKT SC by extension"},
- {meta_WII_BNS, "Nintendo BNS header"},
+ {meta_BNS, "Nintendo BNS header"},
{meta_WII_WAS, "Sumo Digital iSWS header"},
{meta_XBOX_HLWAV, "Half-Life 2 .WAV header"},
{meta_MYSPD, "Punchers Impact .MYSPD header"},
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 35a59e1e..33160190 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -298,7 +298,6 @@
-
@@ -370,6 +369,7 @@
+
@@ -377,6 +377,7 @@
+
@@ -423,6 +424,7 @@
+
@@ -441,6 +443,7 @@
+
@@ -499,6 +502,7 @@
+
@@ -549,12 +553,9 @@
-
-
-
@@ -565,7 +566,6 @@
-
@@ -574,8 +574,6 @@
-
-
@@ -622,6 +620,7 @@
+
@@ -689,9 +688,8 @@
+
-
-
@@ -709,7 +707,6 @@
-
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 9cf33c32..da3dfccb 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -715,9 +715,6 @@
layout\Source Files
-
- layout\Source Files
-
layout\Source Files
@@ -931,6 +928,9 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
@@ -952,6 +952,9 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
@@ -1090,6 +1093,9 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
@@ -1144,6 +1150,9 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
@@ -1318,6 +1327,9 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
@@ -1468,24 +1480,15 @@
meta\Source Files
-
- meta\Source Files
-
meta\Source Files
-
- meta\Source Files
-
meta\Source Files
meta\Source Files
-
- meta\Source Files
-
meta\Source Files
@@ -1516,9 +1519,6 @@
meta\Source Files
-
- meta\Source Files
-
meta\Source Files
@@ -1543,12 +1543,6 @@
meta\Source Files
-
- meta\Source Files
-
-
- meta\Source Files
-
meta\Source Files
@@ -1687,6 +1681,9 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
@@ -1888,15 +1885,12 @@
meta\Source Files
+
+ meta\Source Files
+
meta\Source Files
-
- meta\Source Files
-
-
- meta\Source Files
-
meta\Source Files
@@ -1948,9 +1942,6 @@
meta\Source Files
-
- meta\Source Files
-
meta\Source Files
diff --git a/src/meta/ps2_bg00.c b/src/meta/bg00.c
similarity index 100%
rename from src/meta/ps2_bg00.c
rename to src/meta/bg00.c
diff --git a/src/meta/wii_bns.c b/src/meta/bns.c
similarity index 97%
rename from src/meta/wii_bns.c
rename to src/meta/bns.c
index 12fc35c3..c184f59e 100644
--- a/src/meta/wii_bns.c
+++ b/src/meta/bns.c
@@ -3,7 +3,7 @@
#include "../util.h"
/* BNS - Wii "Banner Sound" disc jingle */
-VGMSTREAM* init_vgmstream_wii_bns(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_bns(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL;
off_t bns_offset;
uint32_t info_offset = 0, data_offset = 0;
@@ -15,7 +15,7 @@ VGMSTREAM* init_vgmstream_wii_bns(STREAMFILE* sf) {
/* .bin: actual extension
* .bns: header id */
if (!check_extensions(sf, "bin,lbin,bns"))
- goto fail;
+ return NULL;
bns_offset = 0;
if (is_id32be(bns_offset + 0x40, sf, "IMET")) {
@@ -32,9 +32,9 @@ VGMSTREAM* init_vgmstream_wii_bns(STREAMFILE* sf) {
}
if (!is_id32be(bns_offset + 0x00,sf, "BNS "))
- goto fail;
+ return NULL;
if (read_u32be(bns_offset + 0x04,sf) != 0xFEFF0100u)
- goto fail;
+ return NULL;
/* find chunks */
{
@@ -110,7 +110,7 @@ VGMSTREAM* init_vgmstream_wii_bns(STREAMFILE* sf) {
vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail;
- vgmstream->meta_type = meta_WII_BNS;
+ vgmstream->meta_type = meta_BNS;
vgmstream->sample_rate = sample_rate;
vgmstream->num_samples = sample_count;
vgmstream->loop_start_sample = loop_start;
diff --git a/src/meta/ps2_filp.c b/src/meta/filp.c
similarity index 100%
rename from src/meta/ps2_filp.c
rename to src/meta/filp.c
diff --git a/src/meta/ps2_hgc1.c b/src/meta/hgc1.c
similarity index 100%
rename from src/meta/ps2_hgc1.c
rename to src/meta/hgc1.c
diff --git a/src/meta/meta.h b/src/meta/meta.h
index 5bf3da64..4f677693 100644
--- a/src/meta/meta.h
+++ b/src/meta/meta.h
@@ -410,7 +410,7 @@ VGMSTREAM * init_vgmstream_sab(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_exakt_sc(STREAMFILE* streamFile);
-VGMSTREAM * init_vgmstream_wii_bns(STREAMFILE* streamFile);
+VGMSTREAM* init_vgmstream_bns(STREAMFILE* sf);
VGMSTREAM * init_vgmstream_pona_3do(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_pona_psx(STREAMFILE* streamFile);
diff --git a/src/meta/wii_mus.c b/src/meta/mus_krone.c
similarity index 100%
rename from src/meta/wii_mus.c
rename to src/meta/mus_krone.c
diff --git a/src/meta/ps2_sl3.c b/src/meta/sl3.c
similarity index 100%
rename from src/meta/ps2_sl3.c
rename to src/meta/sl3.c
diff --git a/src/meta/ps2_wb.c b/src/meta/wb.c
similarity index 100%
rename from src/meta/ps2_wb.c
rename to src/meta/wb.c
diff --git a/src/vgmstream.c b/src/vgmstream.c
index eca7072b..a8ccf281 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -188,7 +188,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_apple_caff,
init_vgmstream_pc_mxst,
init_vgmstream_sab,
- init_vgmstream_wii_bns,
+ init_vgmstream_bns,
init_vgmstream_wii_was,
init_vgmstream_pona_3do,
init_vgmstream_pona_psx,
diff --git a/src/vgmstream_types.h b/src/vgmstream_types.h
index af2f75f6..e9ed5609 100644
--- a/src/vgmstream_types.h
+++ b/src/vgmstream_types.h
@@ -274,7 +274,7 @@ typedef enum {
meta_THP, /* THP movie files */
meta_SWAV,
meta_NDS_RRDS, /* Ridge Racer DS */
- meta_WII_BNS, /* Wii BNS Banner Sound (similar to RSTM) */
+ meta_BNS,
meta_WIIU_BTSND, /* Wii U Boot Sound */
meta_ADX_03, /* CRI ADX "type 03" */