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

winamp: Fix old bug when seeking past file

Browse Source
This commit is contained in:
bnnm 2017-09-17 03:37:18 +02:00
parent 952962f91b
commit 82a9198fc5
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
winamp/in_vgmstream.c
View File

@ -714,8 +714,10 @@ int winamp_GetOutputTime() {
/* seeks to point in stream (in ms) */
void winamp_SetOutputTime(int time_in_ms) {
if (vgmstream)
seek_needed_samples = (long long)time_in_ms * vgmstream->sample_rate / 1000LL;
if (!vgmstream)
return;
seek_needed_samples = (long long)time_in_ms * vgmstream->sample_rate / 1000LL;
}
/* pass these commands through */
@ -818,6 +820,7 @@ void winamp_EQSet(int on, char data[10], int preamp) {
DWORD WINAPI __stdcall decode(void *arg) {
/* channel count shouldn't change during decode */
int max_buffer_samples = sizeof(sample_buffer)/sizeof(sample_buffer[0])/2/vgmstream->channels;
int max_samples = get_vgmstream_play_samples(loop_count,fade_seconds,fade_delay_seconds,vgmstream);
while (!decode_abort) {
int samples_to_do;
@ -842,12 +845,21 @@ DWORD WINAPI __stdcall decode(void *arg) {
decode_pos_ms = 0;
}
/* adjust seeking past file, can happen using the right (->) key
* (should be done here and not in SetOutputTime due to threads/race condicions) */
if (seek_needed_samples > max_samples) {
seek_needed_samples = max_samples;
}
/* adjust max samples to seek */
if (decode_pos_samples < seek_needed_samples) {
samples_to_do = seek_needed_samples-decode_pos_samples;
samples_to_do = seek_needed_samples - decode_pos_samples;
if (samples_to_do > max_buffer_samples)
samples_to_do = max_buffer_samples;
} else
}
else {
seek_needed_samples = -1;
}
input_module.outMod->Flush((int)decode_pos_ms);
}