Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-28 16:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: ps2_omu to omu

Browse Source
This commit is contained in:
bnnm 2023-06-25 16:22:29 +02:00
parent aa0d5bf9df
commit 8fe3caba59
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/formats.c
View File

@ -994,7 +994,7 @@ static const meta_info meta_info_list[] = {
{meta_XA, "Sony XA header"}, {meta_XA, "Sony XA header"},
{meta_RXWS, "Sony RXWS header"}, {meta_RXWS, "Sony RXWS header"},
{meta_RAW_INT, "PS2 .int raw header"}, {meta_RAW_INT, "PS2 .int raw header"},
{meta_PS2_OMU, "Alter Echo OMU Header"}, {meta_OMU, "Outrage OMU Header"},
{meta_DSP_STM, "Intelligent Systems STM header"}, {meta_DSP_STM, "Intelligent Systems STM header"},
{meta_EXST, "Sony EXST header"}, {meta_EXST, "Sony EXST header"},
{meta_SVAG_KCET, "Konami SVAG header"}, {meta_SVAG_KCET, "Konami SVAG header"},

2
src/meta/meta.h
View File

@ -288,7 +288,7 @@ VGMSTREAM * init_vgmstream_ps2_rnd(STREAMFILE *streamFile);
VGMSTREAM * init_vgmstream_kraw(STREAMFILE *streamFile); VGMSTREAM * init_vgmstream_kraw(STREAMFILE *streamFile);
VGMSTREAM * init_vgmstream_ps2_omu(STREAMFILE *streamFile); VGMSTREAM* init_vgmstream_omu(STREAMFILE* sf);
VGMSTREAM* init_vgmstream_xa2_acclaim(STREAMFILE* sf); VGMSTREAM* init_vgmstream_xa2_acclaim(STREAMFILE* sf);

12
src/meta/omu.c
View File

@ -1,7 +1,7 @@
#include "meta.h" #include "meta.h"
/* IMU - found in Alter Echo (PS2) */ /* IMU - found in Alter Echo (PS2) */
VGMSTREAM* init_vgmstream_ps2_omu(STREAMFILE* sf) { VGMSTREAM* init_vgmstream_omu(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
off_t start_offset; off_t start_offset;
int loop_flag, channels; int loop_flag, channels;
@ -9,13 +9,11 @@ VGMSTREAM* init_vgmstream_ps2_omu(STREAMFILE* sf) {
/* checks */ /* checks */
if (!is_id32be(0x00,sf, "OMU ")) if (!is_id32be(0x00,sf, "OMU "))
goto fail; return NULL;
if (!check_extensions(sf,"omu")) if (!check_extensions(sf,"omu"))
goto fail; return NULL;
if (!is_id32be(0x08,sf, "FRMT")) if (!is_id32be(0x08,sf, "FRMT"))
goto fail; return NULL;
loop_flag = 1; loop_flag = 1;
channels = read_u8(0x14,sf); channels = read_u8(0x14,sf);
@ -33,7 +31,7 @@ VGMSTREAM* init_vgmstream_ps2_omu(STREAMFILE* sf) {
vgmstream->coding_type = coding_PCM16LE; vgmstream->coding_type = coding_PCM16LE;
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = 0x200; vgmstream->interleave_block_size = 0x200;
vgmstream->meta_type = meta_PS2_OMU; vgmstream->meta_type = meta_OMU;
if (!vgmstream_open_stream(vgmstream, sf, start_offset)) if (!vgmstream_open_stream(vgmstream, sf, start_offset))
goto fail; goto fail;

2
src/vgmstream.c
View File

@ -122,7 +122,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_ps2_rnd, init_vgmstream_ps2_rnd,
init_vgmstream_idsp_tt, init_vgmstream_idsp_tt,
init_vgmstream_kraw, init_vgmstream_kraw,
init_vgmstream_ps2_omu, init_vgmstream_omu,
init_vgmstream_xa2_acclaim, init_vgmstream_xa2_acclaim,
init_vgmstream_idsp_nl, init_vgmstream_idsp_nl,
init_vgmstream_idsp_ie, init_vgmstream_idsp_ie,

2
src/vgmstream_types.h
View File

@ -353,7 +353,7 @@ typedef enum {
meta_SAP, meta_SAP,
meta_DC_IDVI, /* Eldorado Gate */ meta_DC_IDVI, /* Eldorado Gate */
meta_KRAW, /* Geometry Wars - Galaxies */ meta_KRAW, /* Geometry Wars - Galaxies */
meta_PS2_OMU, /* PS2 Int file with Header */ meta_OMU,
meta_XA2_ACCLAIM, meta_XA2_ACCLAIM,
meta_NUB, meta_NUB,
meta_IDSP_NL, /* Mario Strikers Charged (Wii) */ meta_IDSP_NL, /* Mario Strikers Charged (Wii) */