oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.16.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann 2011-04-12 08:11:33 +02:00
commit c2ada39fd3
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NEWS
View File

@ -15,6 +15,10 @@ ver 0.17 (2011/??/??)
* state_file: add option "restore_paused" * 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) ver 0.16.2 (2011/03/18)
* configure.ac: * configure.ac:
- fix bashism in tremor test - fix bashism in tremor test
@ -160,6 +164,13 @@ ver 0.16 (2010/12/11)
* make single mode 'sticky' * 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) ver 0.15.16 (2011/03/13)
* output: * output:
- ao: initialize the ao_sample_format struct - ao: initialize the ao_sample_format struct

2
configure.ac
View File

@ -1120,7 +1120,7 @@ if
fi fi
AM_CONDITIONAL(HAVE_OGG_COMMON, 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, AM_CONDITIONAL(HAVE_FLAC_COMMON,
test x$enable_flac = xyes || test x$enable_oggflac = xyes) test x$enable_flac = xyes || test x$enable_oggflac = xyes)

3
src/audio_parser.c
View File

@ -192,7 +192,8 @@ audio_format_parse(struct audio_format *dest, const char *src,
} }
audio_format_init(dest, rate, sample_format, channels); 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; return true;
} }

2
src/command.c
View File

@ -467,7 +467,7 @@ handle_currentsong(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[]) G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{ {
playlist_print_current(client, &g_playlist); playlist_print_current(client, &g_playlist);
return PLAYLIST_RESULT_SUCCESS; return COMMAND_RETURN_OK;
} }
static enum command_return static enum command_return

2
src/decoder/flac_decoder_plugin.c
View File

@ -81,7 +81,7 @@ flac_tell_cb(G_GNUC_UNUSED const FLAC__StreamDecoder *fd,
struct flac_data *data = (struct flac_data *) fdata; struct flac_data *data = (struct flac_data *) fdata;
if (!data->input_stream->seekable) 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); *offset = (long)(data->input_stream->offset);