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

gme: use song-reported fade-out time when available

This commit is contained in:
John Regan 2020-04-26 09:24:34 -04:00
parent 90a2109fd1
commit 6423670eae
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,10 +173,16 @@ gme_file_decode(DecoderClient &client, Path path_fs)
} }
const int length = ti->play_length; const int length = ti->play_length;
#if GME_VERSION >= 0x000700
const int fade = ti->fade_length;
#else
const int fade = -1;
#endif
gme_free_info(ti); gme_free_info(ti);
const SignedSongTime song_len = length > 0 const SignedSongTime song_len = length > 0
? SignedSongTime::FromMS(length + gme_default_fade) ? SignedSongTime::FromMS(length +
(fade == -1 ? gme_default_fade : fade))
: SignedSongTime::Negative(); : SignedSongTime::Negative();
/* initialize the MPD decoder */ /* initialize the MPD decoder */
@ -191,10 +197,10 @@ gme_file_decode(DecoderClient &client, Path path_fs)
if (gme_err != nullptr) if (gme_err != nullptr)
LogWarning(gme_domain, gme_err); LogWarning(gme_domain, gme_err);
if (length > 0) if (length > 0 && fade != 0)
gme_set_fade(emu, length gme_set_fade(emu, length
#if GME_VERSION >= 0x000700 #if GME_VERSION >= 0x000700
, gme_default_fade , fade == -1 ? gme_default_fade : fade
#endif #endif
); );
@ -229,7 +235,11 @@ ScanGmeInfo(const gme_info_t &info, unsigned song_num, int track_count,
TagHandler &handler) noexcept TagHandler &handler) noexcept
{ {
if (info.play_length > 0) if (info.play_length > 0)
handler.OnDuration(SongTime::FromMS(info.play_length + gme_default_fade)); handler.OnDuration(SongTime::FromMS(info.play_length
#if GME_VERSION >= 0x000700
+ (info.fade_length == -1 ? gme_default_fade : info.fade_length)
#endif
));
if (track_count > 1) if (track_count > 1)
handler.OnTag(TAG_TRACK, StringFormat<16>("%u", song_num + 1).c_str()); handler.OnTag(TAG_TRACK, StringFormat<16>("%u", song_num + 1).c_str());