mirror of
https://github.com/vgmstream/vgmstream.git
synced 2025-02-07 15:01:24 +01:00
Remove fake .pos+.ogg (use TXTP), cleanup
This commit is contained in:
parent
4e9b6cd6ec
commit
716aea3369
@ -1,46 +1,34 @@
|
|||||||
#include "meta.h"
|
#include "meta.h"
|
||||||
|
|
||||||
/* .pos - loop points for .wav [Ys I Complete (PC); reused for manual looping] */
|
/* .pos - loop points for .wav [Ys I-II Complete (PC)] */
|
||||||
VGMSTREAM * init_vgmstream_pos(STREAMFILE *streamFile) {
|
VGMSTREAM* init_vgmstream_pos(STREAMFILE* sf) {
|
||||||
VGMSTREAM * vgmstream = NULL;
|
VGMSTREAM* vgmstream = NULL;
|
||||||
STREAMFILE * streamData = NULL;
|
STREAMFILE* sf_data = NULL;
|
||||||
int32_t loop_start, loop_end;
|
int32_t loop_start, loop_end;
|
||||||
|
|
||||||
|
|
||||||
/* checks */
|
/* checks */
|
||||||
if (!check_extensions(streamFile, "pos"))
|
if (get_streamfile_size(sf) != 0x08)
|
||||||
goto fail;
|
return NULL;
|
||||||
if (get_streamfile_size(streamFile) != 0x08)
|
if (!check_extensions(sf, "pos"))
|
||||||
goto fail;
|
return NULL;
|
||||||
|
|
||||||
streamData = open_streamfile_by_ext(streamFile, "wav");
|
sf_data = open_streamfile_by_ext(sf, "wav");
|
||||||
if (streamData) {
|
if (sf_data) {
|
||||||
vgmstream = init_vgmstream_riff(streamData);
|
vgmstream = init_vgmstream_riff(sf_data);
|
||||||
if (!vgmstream) goto fail;
|
if (!vgmstream) goto fail;
|
||||||
vgmstream->meta_type = meta_RIFF_WAVE_POS;
|
vgmstream->meta_type = meta_RIFF_WAVE_POS;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
#ifdef VGM_USE_VORBIS
|
|
||||||
/* hack for Ogg with external loops */
|
|
||||||
streamData = open_streamfile_by_ext(streamFile, "ogg");
|
|
||||||
if (streamData) {
|
|
||||||
vgmstream = init_vgmstream_ogg_vorbis(streamData);
|
|
||||||
if (!vgmstream) goto fail;
|
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
goto fail;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
close_streamfile(streamData);
|
close_streamfile(sf_data);
|
||||||
streamData = NULL;
|
sf_data = NULL;
|
||||||
|
|
||||||
/* install loops (wrong values are validated later) */
|
/* install loops (wrong values are validated later) */
|
||||||
loop_start = read_32bitLE(0x00, streamFile);
|
loop_start = read_s32le(0x00, sf);
|
||||||
loop_end = read_32bitLE(0x04, streamFile);
|
loop_end = read_s32le(0x04, sf);
|
||||||
if (loop_end <= 0 || (loop_end > vgmstream->num_samples)) {
|
if (loop_end <= 0 || (loop_end > vgmstream->num_samples)) {
|
||||||
loop_end = vgmstream->num_samples;
|
loop_end = vgmstream->num_samples;
|
||||||
}
|
}
|
||||||
@ -49,7 +37,7 @@ VGMSTREAM * init_vgmstream_pos(STREAMFILE *streamFile) {
|
|||||||
return vgmstream;
|
return vgmstream;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
close_streamfile(streamData);
|
close_streamfile(sf_data);
|
||||||
close_vgmstream(vgmstream);
|
close_vgmstream(vgmstream);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user