diff --git a/src/formats.c b/src/formats.c index 52930fd1..ad1cb1de 100644 --- a/src/formats.c +++ b/src/formats.c @@ -1261,7 +1261,7 @@ static const meta_info meta_info_list[] = { {meta_EA_BNK, "Electronic Arts BNK header"}, {meta_SK_AUD, "Silicon Knights AUD header"}, {meta_AHX, "CRI AHX header"}, - {meta_STM, "Angel Studios/Rockstar San Diego STMA header"}, + {meta_STMA, "Angel Studios/Rockstar San Diego STMA header"}, {meta_BINK, "RAD Game Tools Bink header"}, {meta_EA_SNU, "Electronic Arts SNU header"}, {meta_AWC, "Rockstar AWC header"}, diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 8411cadd..6511f92d 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -642,7 +642,7 @@ - + diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index f774e7d4..f78b80a9 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -1747,7 +1747,7 @@ meta\Source Files - + meta\Source Files diff --git a/src/meta/meta.h b/src/meta/meta.h index cd4e0c19..771369c8 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -615,7 +615,7 @@ VGMSTREAM * init_vgmstream_ea_schl_fixed(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_sk_aud(STREAMFILE * streamFile); -VGMSTREAM* init_vgmstream_stm(STREAMFILE* sf); +VGMSTREAM* init_vgmstream_stma(STREAMFILE* sf); VGMSTREAM * init_vgmstream_awc(STREAMFILE * streamFile); diff --git a/src/meta/stm.c b/src/meta/stma.c similarity index 96% rename from src/meta/stm.c rename to src/meta/stma.c index d766deef..33988bca 100644 --- a/src/meta/stm.c +++ b/src/meta/stma.c @@ -2,7 +2,7 @@ #include "../coding/coding.h" /* STM - from Angel Studios/Rockstar San Diego games [Red Dead Revolver (PS2), Spy Hunter 2 (PS2/Xbox)] */ -VGMSTREAM* init_vgmstream_stm(STREAMFILE* sf) { +VGMSTREAM* init_vgmstream_stma(STREAMFILE* sf) { VGMSTREAM* vgmstream = NULL; off_t start_offset; int loop_flag = 0, channel_count; @@ -65,7 +65,7 @@ VGMSTREAM* init_vgmstream_stm(STREAMFILE* sf) { if (!vgmstream) goto fail; vgmstream->sample_rate = read_32bit(0xc,sf); - vgmstream->meta_type = meta_STM; + vgmstream->meta_type = meta_STMA; vgmstream->layout_type = (channel_count > 1) ? layout_interleave : layout_none; switch(bps) { @@ -109,7 +109,7 @@ VGMSTREAM* init_vgmstream_stm(STREAMFILE* sf) { } - if (!vgmstream_open_stream(vgmstream,sf,start_offset)) + if (!vgmstream_open_stream(vgmstream, sf, start_offset)) goto fail; return vgmstream; diff --git a/src/vgmstream.c b/src/vgmstream.c index a7261338..dbd4b1d9 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -305,7 +305,7 @@ init_vgmstream_t init_vgmstream_functions[] = { init_vgmstream_ea_mpf_mus, init_vgmstream_ea_schl_fixed, init_vgmstream_sk_aud, - init_vgmstream_stm, + init_vgmstream_stma, init_vgmstream_ea_snu, init_vgmstream_awc, init_vgmstream_opus_std, diff --git a/src/vgmstream_types.h b/src/vgmstream_types.h index 2e75428c..01e232e8 100644 --- a/src/vgmstream_types.h +++ b/src/vgmstream_types.h @@ -544,7 +544,7 @@ typedef enum { meta_TXTH, /* generic text header */ meta_SK_AUD, /* Silicon Knights .AUD (Eternal Darkness GC) */ meta_AHX, - meta_STM, /* Angel Studios/Rockstar San Diego Games */ + meta_STMA, meta_BINK, /* RAD Game Tools BINK audio/video */ meta_EA_SNU, /* Electronic Arts SNU (Dead Space) */ meta_AWC, /* Rockstar AWC (GTA5, RDR) */