Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-22 05:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix disabling loops also erasing loop points

Browse Source
This commit is contained in:
bnnm 2024-12-31 16:38:15 +01:00
parent 84f25abdf1
commit 97e46436d7
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vgmstream.c
View File

@ -136,13 +136,16 @@ void setup_vgmstream(VGMSTREAM* vgmstream) {
vgmstream->loop_end_sample = 0; vgmstream->loop_end_sample = 0;
} }
} }
#if 0
//TODO: this removes loop info after disabling loops externally (this must be called), though this is not very useful
/* clean as loops are readable metadata but loop fields may contain garbage /* clean as loops are readable metadata but loop fields may contain garbage
* (done *after* dual stereo as it needs loop fields to match) */ * (done *after* dual stereo as it needs loop fields to match) */
if (!vgmstream->loop_flag) { if (!vgmstream->loop_flag) {
vgmstream->loop_start_sample = 0; vgmstream->loop_start_sample = 0;
vgmstream->loop_end_sample = 0; vgmstream->loop_end_sample = 0;
} }
#endif
/* save start things so we can restart when seeking */ /* save start things so we can restart when seeking */
memcpy(vgmstream->start_ch, vgmstream->ch, sizeof(VGMSTREAMCHANNEL)*vgmstream->channels); memcpy(vgmstream->start_ch, vgmstream->ch, sizeof(VGMSTREAMCHANNEL)*vgmstream->channels);
@ -220,7 +223,12 @@ VGMSTREAM* allocate_vgmstream(int channels, int loop_flag) {
vgmstream->loop_flag = loop_flag; vgmstream->loop_flag = loop_flag;
vgmstream->mixer = mixer_init(vgmstream->channels); /* pre-init */ vgmstream->mixer = mixer_init(vgmstream->channels); /* pre-init */
//if (!vgmstream->mixer) goto fail; if (!vgmstream->mixer) goto fail;
#if VGM_TEST_DECODER
vgmstream->decode_state = decode_init();
if (!vgmstream->decode_state) goto fail;
#endif
//TODO: improve/init later to minimize memory //TODO: improve/init later to minimize memory
/* garbage buffer for seeking/discarding (local bufs may cause stack overflows with segments/layers) /* garbage buffer for seeking/discarding (local bufs may cause stack overflows with segments/layers)
@ -412,6 +420,9 @@ static bool merge_vgmstream(VGMSTREAM* opened_vgmstream, VGMSTREAM* new_vgmstrea
opened_vgmstream->layout_type = layout_none; /* fixes some odd cases */ opened_vgmstream->layout_type = layout_none; /* fixes some odd cases */
/* discard the second VGMSTREAM */ /* discard the second VGMSTREAM */
#if VGM_TEST_DECODER
decode_free(new_vgmstream);
#endif
mixer_free(new_vgmstream->mixer); mixer_free(new_vgmstream->mixer);
free(new_vgmstream->tmpbuf); free(new_vgmstream->tmpbuf);
free(new_vgmstream->start_vgmstream); free(new_vgmstream->start_vgmstream);