From 8a8ebe3e249535a3f94a8fa66c505f44e3908f3c Mon Sep 17 00:00:00 2001 From: bnnm Date: Fri, 29 Sep 2017 23:37:20 +0200 Subject: [PATCH] Minor renames for style (ps3_xvag > xvag, x360_nub > nub_xma) --- src/formats.c | 2 +- src/libvgmstream.vcproj | 16 ++++++++-------- src/libvgmstream.vcxproj | 4 ++-- src/libvgmstream.vcxproj.filters | 12 ++++++------ src/meta/meta.h | 4 ++-- src/meta/{x360_nub.c => nub_xma.c} | 2 +- src/meta/{ps3_xvag.c => xvag.c} | 4 ++-- src/vgmstream.c | 4 ++-- src/vgmstream.h | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) rename src/meta/{x360_nub.c => nub_xma.c} (95%) rename src/meta/{ps3_xvag.c => xvag.c} (96%) diff --git a/src/formats.c b/src/formats.c index 658bc7b5..08df838c 100644 --- a/src/formats.c +++ b/src/formats.c @@ -811,7 +811,7 @@ static const meta_info meta_info_list[] = { {meta_FFW, "Freedom Fighters BGM header"}, {meta_DSP_DSPW, "DSPW dsp header"}, {meta_PS2_JSTM, "JSTM Header"}, - {meta_PS3_XVAG, "XVAG Header"}, + {meta_XVAG, "Sony XVAG header"}, {meta_PS3_CPS, "tri-Crescendo CPS Header"}, {meta_SQEX_SCD, "Square-Enix SCD header"}, {meta_NGC_NST_DSP, "Animaniacs NST header"}, diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj index 76bdce31..d469f3d4 100644 --- a/src/libvgmstream.vcproj +++ b/src/libvgmstream.vcproj @@ -626,6 +626,10 @@ RelativePath=".\meta\nub_vag.c" > + + @@ -998,10 +1002,6 @@ RelativePath=".\meta\vawx.c" > - - @@ -1230,10 +1230,6 @@ RelativePath=".\meta\x360_cxs.c" > - - @@ -1278,6 +1274,10 @@ RelativePath=".\meta\xss.c" > + + diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index f5511888..49d64b48 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -281,6 +281,7 @@ + @@ -359,7 +360,6 @@ - @@ -416,9 +416,9 @@ - + diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index 6927059d..f8f49919 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -373,6 +373,9 @@ meta\Source Files + + meta\Source Files + meta\Source Files @@ -607,9 +610,6 @@ meta\Source Files - - meta\Source Files - meta\Source Files @@ -754,9 +754,6 @@ meta\Source Files - - meta\Source Files - meta\Source Files @@ -784,6 +781,9 @@ meta\Source Files + + meta\Source Files + meta\Source Files diff --git a/src/meta/meta.h b/src/meta/meta.h index fbbb0699..a5194d87 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -536,7 +536,7 @@ VGMSTREAM * init_vgmstream_dsp_dspw(STREAMFILE* streamFile); VGMSTREAM * init_vgmstream_ps2_jstm(STREAMFILE* streamFile); -VGMSTREAM * init_vgmstream_ps3_xvag(STREAMFILE* streamFile); +VGMSTREAM * init_vgmstream_xvag(STREAMFILE* streamFile); VGMSTREAM * init_vgmstream_ps3_cps(STREAMFILE* streamFile); @@ -645,7 +645,7 @@ VGMSTREAM * init_vgmstream_wwise(STREAMFILE *streamFile); VGMSTREAM * init_vgmstream_ubi_raki(STREAMFILE* streamFile); -VGMSTREAM * init_vgmstream_x360_nub(STREAMFILE *streamFile); +VGMSTREAM * init_vgmstream_nub_xma(STREAMFILE *streamFile); VGMSTREAM * init_vgmstream_x360_pasx(STREAMFILE *streamFile); diff --git a/src/meta/x360_nub.c b/src/meta/nub_xma.c similarity index 95% rename from src/meta/x360_nub.c rename to src/meta/nub_xma.c index 3c4cae95..cb33d551 100644 --- a/src/meta/x360_nub.c +++ b/src/meta/nub_xma.c @@ -2,7 +2,7 @@ #include "../coding/coding.h" /* Namco NUB xma - from Tekken 6, Galaga Legions DX */ -VGMSTREAM * init_vgmstream_x360_nub(STREAMFILE *streamFile) { +VGMSTREAM * init_vgmstream_nub_xma(STREAMFILE *streamFile) { VGMSTREAM * vgmstream = NULL; off_t start_offset, chunk_offset; size_t data_size, chunk_size; diff --git a/src/meta/ps3_xvag.c b/src/meta/xvag.c similarity index 96% rename from src/meta/ps3_xvag.c rename to src/meta/xvag.c index 009376ee..987db2f1 100644 --- a/src/meta/ps3_xvag.c +++ b/src/meta/xvag.c @@ -5,7 +5,7 @@ static int ps_adpcm_find_loop_offsets(STREAMFILE *streamFile, int channel_count, off_t start_offset, off_t * loop_start, off_t * loop_end); /* XVAG - Sony's (second party?) format (God of War III, Ratchet & Clank Future, The Last of Us, Uncharted) */ -VGMSTREAM * init_vgmstream_ps3_xvag(STREAMFILE *streamFile) { +VGMSTREAM * init_vgmstream_xvag(STREAMFILE *streamFile) { VGMSTREAM * vgmstream = NULL; int32_t (*read_32bit)(off_t,STREAMFILE*) = NULL; int loop_flag = 0, channel_count, codec; @@ -57,7 +57,7 @@ VGMSTREAM * init_vgmstream_ps3_xvag(STREAMFILE *streamFile) { vgmstream->sample_rate = sample_rate; vgmstream->num_samples = num_samples; - vgmstream->meta_type = meta_PS3_XVAG; + vgmstream->meta_type = meta_XVAG; switch (codec) { case 0x06: /* PS ADPCM: God of War III, Uncharted 1/2, Ratchet and Clank Future */ diff --git a/src/vgmstream.c b/src/vgmstream.c index 2ef7dbe0..f1d330b4 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -292,7 +292,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = { init_vgmstream_ffw, init_vgmstream_dsp_dspw, init_vgmstream_ps2_jstm, - init_vgmstream_ps3_xvag, + init_vgmstream_xvag, init_vgmstream_ps3_cps, init_vgmstream_sqex_scd, init_vgmstream_ngc_nst_dsp, @@ -350,7 +350,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = { init_vgmstream_wwise, init_vgmstream_ubi_raki, init_vgmstream_x360_pasx, - init_vgmstream_x360_nub, + init_vgmstream_nub_xma, init_vgmstream_xma, init_vgmstream_sxd, init_vgmstream_ogl, diff --git a/src/vgmstream.h b/src/vgmstream.h index 71fd7bb7..76b92009 100644 --- a/src/vgmstream.h +++ b/src/vgmstream.h @@ -556,7 +556,7 @@ typedef enum { meta_SQEX_SCD, /* Square-Enix SCD */ meta_NGC_NST_DSP, /* Animaniacs [NGC] */ meta_BAF, /* Bizarre Creations (Blur, James Bond) */ - meta_PS3_XVAG, /* Ratchet & Clank Future: Quest for Booty (PS3) */ + meta_XVAG, /* Ratchet & Clank Future: Quest for Booty (PS3) */ meta_PS3_CPS, /* Eternal Sonata (PS3) */ meta_PS3_MSF, /* MSF header */ meta_NUB_VAG, /* Namco VAG from NUB archives */