[pulseaudio-commits] configure.ac src/daemon

[Peter Meerwald]

 configure.ac      |    4 +++-
 src/daemon/main.c |    4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 64f3b5711bc090e06ee40fe12cac55acde3af5f2
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Tue Nov 11 15:39:59 2014 +0100

    build-sys: Deprecate libsamplerate support
    
    output DEPRECATED warnings for libsamplerate in configure and
    PA daemon's log
    
    libsamplerate offers no particular advantage over the speex
    resampler and is distributed under GPL; support for it will be removed
    in one of the next releases
    
    v2: (thanks Arun Raghavan)
    * log a warning (instead of info)
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/configure.ac b/configure.ac
index e91e990..edf3273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -684,6 +684,8 @@ AS_IF([test "x$enable_samplerate" = "xyes" && test "x$HAVE_LIBSAMPLERATE" = "x0"
 AM_CONDITIONAL([HAVE_LIBSAMPLERATE], [test "x$HAVE_LIBSAMPLERATE" = x1])
 AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], AC_DEFINE([HAVE_LIBSAMPLERATE], 1, [Have libsamplerate?]))
 
+AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], AC_MSG_WARN([Support for libsamplerate is DEPRECATED]))
+
 #### Database support ####
 
 AC_ARG_WITH([database],
@@ -1517,7 +1519,7 @@ AS_IF([test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"], ENABLE_BLUEZ_5_OFONO_HEADSET
 AS_IF([test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"], ENABLE_BLUEZ_5_NATIVE_HEADSET=yes, ENABLE_BLUEZ_5_NATIVE_HEADSET=no)
 AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], ENABLE_HAL_COMPAT=yes, ENABLE_HAL_COMPAT=no)
 AS_IF([test "x$HAVE_TCPWRAP" = "x1"], ENABLE_TCPWRAP=yes, ENABLE_TCPWRAP=no)
-AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE=yes, ENABLE_LIBSAMPLERATE=no)
+AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE="yes (DEPRECATED)", ENABLE_LIBSAMPLERATE=no)
 AS_IF([test "x$HAVE_IPV6" = "x1"], ENABLE_IPV6=yes, ENABLE_IPV6=no)
 AS_IF([test "x$HAVE_OPENSSL" = "x1"], ENABLE_OPENSSL=yes, ENABLE_OPENSSL=no)
 AS_IF([test "x$HAVE_FFTW" = "x1"], ENABLE_FFTW=yes, ENABLE_FFTW=no)
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 0ffc7bd..d41554f 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -910,6 +910,10 @@ int main(int argc, char *argv[]) {
     pa_log_debug("Compilation host: %s", CANONICAL_HOST);
     pa_log_debug("Compilation CFLAGS: %s", PA_CFLAGS);
 
+#ifdef HAVE_LIBSAMPLERATE
+    pa_log_warn("Compiled with DEPRECATED libsamplerate support!");
+#endif
+
     s = pa_uname_string();
     pa_log_debug("Running on host: %s", s);
     pa_xfree(s);