[pulseaudio-commits] 2 commits - configure.ac man/pulse-daemon.conf.5.xml.in

[Arun Raghavan]

 configure.ac                   |    2 +-
 man/pulse-daemon.conf.5.xml.in |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ead5447231a913fe5fece6eff932626b2031641e
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Mon Nov 12 22:24:52 2012 +0530

    man: Correction for how sample rate switching is disabled
    
    Setting to 0 in the parser causes daemon startup to fail.

diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 49f9f22..c270d2b 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -437,7 +437,8 @@ USA.
       or 48kHz. Switching between default and alternate values is
       enabled only when the sinks/sources are suspended. This option
       is ignored in passthrough mode where the stream rate will be used.
-      If set to zero, this feature is disabled.</p>
+      If set to the same as the default sample rate, this feature is
+      disabled.</p>
     </option>
 
   </section>

commit 706e7aeb258130a22e4f13786679603e0c3c9cf0
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat Nov 10 16:41:27 2012 +0000

    build-sys: Correct bluez support error if sbc is missing

diff --git a/configure.ac b/configure.ac
index b63b0d2..99aafda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1012,7 +1012,7 @@ AS_IF([test "x$enable_bluez" != "xno"],
 AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
 
 AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
-    [AC_MSG_ERROR([*** BLUEZ support not found (requires D-Bus)])])
+    [AC_MSG_ERROR([*** BLUEZ support not found (requires BlueZ, sbc, and D-Bus)])])
 
 AC_SUBST(BLUEZ_CFLAGS)
 AC_SUBST(BLUEZ_LIBS)