Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-21 00:38:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix .txth subfiles with subsongs

Browse Source
This commit is contained in:
bnnm 2020-09-18 23:48:03 +02:00
parent 63c545b4e7
commit cb1b9f9083
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/meta/txth.c
View File

@ -579,7 +579,7 @@ fail:
static VGMSTREAM* init_subfile(txth_header* txth) {
VGMSTREAM* vgmstream = NULL;
char extension[PATH_LIMIT];
STREAMFILE* streamSubfile = NULL;
STREAMFILE* sf_sub = NULL;
if (txth->subfile_size == 0) {
@ -604,10 +604,12 @@ static VGMSTREAM* init_subfile(txth_header* txth) {
strcpy(extension, "subfile_txth.");
strcat(extension, txth->subfile_extension);
streamSubfile = setup_subfile_streamfile(txth->sf_body, txth->subfile_offset, txth->subfile_size, extension);
if (!streamSubfile) goto fail;
sf_sub = setup_subfile_streamfile(txth->sf_body, txth->subfile_offset, txth->subfile_size, extension);
if (!sf_sub) goto fail;
vgmstream = init_vgmstream_from_STREAMFILE(streamSubfile);
sf_sub->stream_index = txth->sf->stream_index; /* in case of subfiles with subsongs */
vgmstream = init_vgmstream_from_STREAMFILE(sf_sub);
if (!vgmstream) goto fail;
/* apply some fields */
@ -643,11 +645,11 @@ static VGMSTREAM* init_subfile(txth_header* txth) {
// txth->loop_flag = vgmstream->loop_flag;
close_streamfile(streamSubfile);
close_streamfile(sf_sub);
return vgmstream;
fail:
close_streamfile(streamSubfile);
close_streamfile(sf_sub);
close_vgmstream(vgmstream);
return NULL;
}