diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
| commit | 0c9fc2f8090ed225c76296088e6760630eb42779 (patch) | |
| tree | 9238436fb89ebf6a91d329eba0f5feec1ad137fd /src/decoder | |
| parent | 1a954748a027aa5b4fc6c85b0ad96c2fa25d53b8 (diff) | |
| parent | fe588a255ba713875a21bb98d3b7daf60af2844e (diff) | |
| download | mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.gz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.xz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.zip | |
Merge commit 'release-0.16.2'
Conflicts:
Makefile.am
NEWS
configure.ac
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/audiofile_decoder_plugin.c | 2 | ||||
| -rw-r--r-- | src/decoder/gme_decoder_plugin.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/decoder/audiofile_decoder_plugin.c b/src/decoder/audiofile_decoder_plugin.c index 6f9d0dd20..c862168f8 100644 --- a/src/decoder/audiofile_decoder_plugin.c +++ b/src/decoder/audiofile_decoder_plugin.c @@ -244,7 +244,7 @@ static const char *const audiofile_suffixes[] = { static const char *const audiofile_mime_types[] = { "audio/x-wav", "audio/x-aiff", - NULL + NULL }; const struct decoder_plugin audiofile_decoder_plugin = { diff --git a/src/decoder/gme_decoder_plugin.c b/src/decoder/gme_decoder_plugin.c index 4a5220a3f..e14a52d32 100644 --- a/src/decoder/gme_decoder_plugin.c +++ b/src/decoder/gme_decoder_plugin.c @@ -153,6 +153,9 @@ gme_file_decode(struct decoder *decoder, const char *path_fs) if((gme_err = gme_start_track(emu, song_num)) != NULL) g_warning("%s", gme_err); + if(ti->length > 0) + gme_set_fade(emu, ti->length); + /* play */ do { gme_err = gme_play(emu, GME_BUFFER_SAMPLES, buf); |