From a28449a123cd1e49503e267f37c3c900f9c70b29 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 16 Mar 2011 19:13:46 +0100 Subject: encoder/vorbis: reset the Ogg stream after flush Without the ogg_stream_reset() call, the "e_o_s" flag never gets reset, and libogg writes EOS packets over and over. --- src/encoder/vorbis_encoder.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c index a5f6387f6..3fbbe5b61 100644 --- a/src/encoder/vorbis_encoder.c +++ b/src/encoder/vorbis_encoder.c @@ -274,6 +274,8 @@ vorbis_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error) vorbis_analysis_init(&encoder->vd, &encoder->vi); vorbis_block_init(&encoder->vd, &encoder->vb); + ogg_stream_reset(&encoder->os); + encoder->flush = true; return true; } -- cgit v1.2.3 From 87ad2f85428ed6fb30e38efbf4c04a9c758e5e5d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Mar 2011 22:16:46 +0100 Subject: command: fix return value of handle_currentsong() Thanks to clang for complaining. --- src/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/command.c b/src/command.c index d30b63594..dd812df50 100644 --- a/src/command.c +++ b/src/command.c @@ -430,7 +430,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 -- cgit v1.2.3 From 532f94a18797b8e349e78ab1e91cfa4a1205cbde Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Mar 2011 22:22:51 +0100 Subject: audio_parser: fix assertion failure in audio format mask parser Use audio_format_mask_valid() to verify a mask. --- src/audio_parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/audio_parser.c b/src/audio_parser.c index ca5182c4a..139cf1c04 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; } -- cgit v1.2.3 From d4b00ff11cf102d8982ef342371acfa16ed2e515 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Mar 2011 22:27:31 +0100 Subject: listen: suppress "unused variable" warning --- src/listen.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/listen.c b/src/listen.c index d6cade855..a4822c104 100644 --- a/src/listen.c +++ b/src/listen.c @@ -413,6 +413,8 @@ static int get_remote_uid(int fd) if (getpeereid(fd, &euid, &egid) == 0) return euid; +#else + (void)fd; #endif return -1; #endif -- cgit v1.2.3 From f680b0a431b35fa5a005fec27899d4b18f664f3c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Mar 2011 22:31:40 +0100 Subject: decoder/flac: fix enum mismatch in flac_tell_cb() Fix clang warning. --- src/decoder/flac_decoder_plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/decoder/flac_decoder_plugin.c b/src/decoder/flac_decoder_plugin.c index e89e2ea11..9d980b79d 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); -- cgit v1.2.3