oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

gme: don't loop forever, fall back to GME's default play length 

Fixes http://bugs.musicpd.org/view.php?id=4432
This commit is contained in:
Max Kellermann 2015-10-26 17:16:20 +01:00
parent a84fbbe327
commit 5719207dfa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -3,6 +3,7 @@ ver 0.19.11 (not yet released)
- ape: fix buffer overflow - ape: fix buffer overflow
* decoder * decoder
- ffmpeg: fix crash due to wrong avio_alloc_context() call - ffmpeg: fix crash due to wrong avio_alloc_context() call
- gme: don't loop forever, fall back to GME's default play length
* encoder * encoder
- flac: fix crash with 32 bit playback - flac: fix crash with 32 bit playback
* mixer * mixer

6
src/decoder/plugins/GmeDecoderPlugin.cxx
View File

@ -156,7 +156,7 @@ gme_file_decode(Decoder &decoder, Path path_fs)
return; return;
} }
const int length = ti->length; const int length = ti->play_length;
gme_free_info(ti); gme_free_info(ti);
const SignedSongTime song_len = length > 0 const SignedSongTime song_len = length > 0
@ -239,9 +239,9 @@ gme_scan_file(Path path_fs,
assert(ti != nullptr); assert(ti != nullptr);
if (ti->length > 0) if (ti->play_length > 0)
tag_handler_invoke_duration(handler, handler_ctx, tag_handler_invoke_duration(handler, handler_ctx,
SongTime::FromMS(ti->length)); SongTime::FromMS(ti->play_length));
if (ti->song != nullptr) { if (ti->song != nullptr) {
if (gme_track_count(emu) > 1) { if (gme_track_count(emu) > 1) {