aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-04-12 08:11:33 +0200
committerMax Kellermann <max@duempel.org>2011-04-12 08:11:33 +0200
commitc2ada39fd3037a0f6180326ecb5fa5913b719326 (patch)
tree68c2f36831283553a5a2e12f2b4f3ad3dd91100f /src
parent77b6e275008743fbd27f423d42d92f74518a5b28 (diff)
parentdef2fe8805d575c4be403f1c28aac70d87759d55 (diff)
downloadmpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.tar.gz
mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.tar.xz
mpd-c2ada39fd3037a0f6180326ecb5fa5913b719326.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (limited to '')
-rw-r--r--src/audio_parser.c3
-rw-r--r--src/command.c2
-rw-r--r--src/decoder/flac_decoder_plugin.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/audio_parser.c b/src/audio_parser.c
index 1138c9588..80bf9a5d7 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 bbfc84359..e369da69b 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 b6991732e..ca9cd5968 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);