summaryrefslogtreecommitdiffstats
authorMax Kellermann <[email protected]>2011-04-12 06:11:33 (GMT)
committer Max Kellermann <[email protected]>2011-04-12 06:11:33 (GMT)
commitc2ada39fd3037a0f6180326ecb5fa5913b719326 (patch) (side-by-side diff)
tree68c2f36831283553a5a2e12f2b4f3ad3dd91100f
parent77b6e275008743fbd27f423d42d92f74518a5b28 (diff)
parentdef2fe8805d575c4be403f1c28aac70d87759d55 (diff)
downloadmpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.zip
mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.tar.gz
mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.tar.bz2
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS11
-rw-r--r--configure.ac2
-rw-r--r--src/audio_parser.c3
-rw-r--r--src/command.c2
-rw-r--r--src/decoder/flac_decoder_plugin.c2
5 files changed, 16 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 5b06a39..cbac812 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ ver 0.17 (2011/??/??)
* state_file: add option "restore_paused"
+ver 0.16.3 (2011/??/??)
+* fix assertion failure in audio format mask parser
+
+
ver 0.16.2 (2011/03/18)
* configure.ac:
- fix bashism in tremor test
@@ -160,6 +164,13 @@ ver 0.16 (2010/12/11)
* make single mode 'sticky'
+ver 0.15.17 (2011/??/??)
+* encoder:
+ - vorbis: reset the Ogg stream after flush
+* decoders:
+ - vorbis: fix tremor support
+
+
ver 0.15.16 (2011/03/13)
* output:
- ao: initialize the ao_sample_format struct
diff --git a/configure.ac b/configure.ac
index dbf84c0..7ea76aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,7 +1120,7 @@ if
fi
AM_CONDITIONAL(HAVE_OGG_COMMON,
- test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
+ test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
AM_CONDITIONAL(HAVE_FLAC_COMMON,
test x$enable_flac = xyes || test x$enable_oggflac = xyes)
diff --git a/src/audio_parser.c b/src/audio_parser.c
index 1138c95..80bf9a5 100644
--- a/src/audio_parser.c
+++ b/src/audio_parser.c
@@ -192,7 +192,8 @@ audio_format_parse(struct audio_format *dest, const char *src,
}
audio_format_init(dest, rate, sample_format, channels);
- assert(audio_format_valid(dest));
+ assert(mask ? audio_format_mask_valid(dest)
+ : audio_format_valid(dest));
return true;
}
diff --git a/src/command.c b/src/command.c
index bbfc843..e369da6 100644
--- a/src/command.c
+++ b/src/command.c
@@ -467,7 +467,7 @@ handle_currentsong(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
playlist_print_current(client, &g_playlist);
- return PLAYLIST_RESULT_SUCCESS;
+ return COMMAND_RETURN_OK;
}
static enum command_return
diff --git a/src/decoder/flac_decoder_plugin.c b/src/decoder/flac_decoder_plugin.c
index b699173..ca9cd59 100644
--- a/src/decoder/flac_decoder_plugin.c
+++ b/src/decoder/flac_decoder_plugin.c
@@ -81,7 +81,7 @@ flac_tell_cb(G_GNUC_UNUSED const FLAC__StreamDecoder *fd,
struct flac_data *data = (struct flac_data *) fdata;
if (!data->input_stream->seekable)
- return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
+ return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
*offset = (long)(data->input_stream->offset);