Merge commit 'release-0.16.2'

Conflicts:
	Makefile.am
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2011-03-19 09:58:07 +01:00
24 changed files with 128 additions and 43 deletions

View File

@@ -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 = {

View File

@@ -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);