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

Merge branch 'v0.16.x'

Browse Source
This commit is contained in:
Max Kellermann 2011-09-16 07:52:39 +02:00
commit 87b624f5d5
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS) AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS)
AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"' AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"'

1
NEWS
View File

@ -22,6 +22,7 @@ ver 0.17 (2011/??/??)
ver 0.16.5 (2010/??/??) ver 0.16.5 (2010/??/??)
* configure.ac: disable assertions in the non-debugging build
* pcm_format: fix 32-to-24 bit conversion (the "silence" bug) * pcm_format: fix 32-to-24 bit conversion (the "silence" bug)
* input: * input:
- rewind: reduce heap usage - rewind: reduce heap usage

10
configure.ac
View File

@ -37,7 +37,9 @@ PKG_PROG_PKG_CONFIG
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Declare Variables dnl Declare Variables
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_SUBST(AM_CPPFLAGS,"")
AC_SUBST(AM_CFLAGS,"") AC_SUBST(AM_CFLAGS,"")
AC_SUBST(AM_CXXFLAGS,"")
AC_SUBST(MPD_LIBS) AC_SUBST(MPD_LIBS)
AC_SUBST(MPD_CFLAGS) AC_SUBST(MPD_CFLAGS)
@ -1469,10 +1471,9 @@ dnl CFLAGS
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl ---------------------------------- debug ---------------------------------- dnl ---------------------------------- debug ----------------------------------
#if test "x$enable_debug" = xno; then if test "x$enable_debug" = xno; then
# don't set NDEBUG for now, until MPD is stable AM_CPPFLAGS="$AM_CPPFLAGS -DNDEBUG"
#AM_CFLAGS="$AM_CFLAGS -DNDEBUG" fi
#fi
dnl ----------------------------------- GCC ----------------------------------- dnl ----------------------------------- GCC -----------------------------------
if test x$GCC = xyes if test x$GCC = xyes
@ -1497,6 +1498,7 @@ fi
dnl ---------------------------- warnings as errors --------------------------- dnl ---------------------------- warnings as errors ---------------------------
if test "x$enable_werror" = xyes; then if test "x$enable_werror" = xyes; then
AM_CFLAGS="$AM_CFLAGS -Werror -pedantic-errors" AM_CFLAGS="$AM_CFLAGS -Werror -pedantic-errors"
AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
fi fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------

2
src/input/curl_input_plugin.c
View File

@ -780,7 +780,7 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
assert(buffer->consumed <= buffer->size); assert(buffer->consumed <= buffer->size);
g_free(data); g_free(buffer);
} }
static void static void

3
src/output/pulse_output_plugin.c
View File

@ -72,7 +72,8 @@ pulse_output_set_mixer(struct pulse_output *po, struct pulse_mixer *pm)
} }
void void
pulse_output_clear_mixer(struct pulse_output *po, struct pulse_mixer *pm) pulse_output_clear_mixer(struct pulse_output *po,
G_GNUC_UNUSED struct pulse_mixer *pm)
{ {
assert(po != NULL); assert(po != NULL);
assert(pm != NULL); assert(pm != NULL);