[pulseaudio-commits] 2 commits - src/pulse src/pulsecore

[Arun Raghavan]

 src/pulse/def.h             |    1 +
 src/pulsecore/sample-util.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a6ad2d860a450599edc60f604f343920250226b4
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Aug 18 14:55:52 2011 +0530

    sink: Add PA_SINK_SET_FORMATS macro
    
    Required for testing the existence of the flag

diff --git a/src/pulse/def.h b/src/pulse/def.h
index d14ebca..9d7cac8 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -773,6 +773,7 @@ typedef enum pa_sink_flags {
 #define PA_SINK_DYNAMIC_LATENCY PA_SINK_DYNAMIC_LATENCY
 #define PA_SINK_SYNC_VOLUME PA_SINK_SYNC_VOLUME
 #define PA_SINK_SHARE_VOLUME_WITH_MASTER PA_SINK_SHARE_VOLUME_WITH_MASTER
+#define PA_SINK_SET_FORMATS PA_SINK_SET_FORMATS
 
 /** \endcond */
 

commit 9083a8f667cc124a7d3c7dcf40a38a9c273856b3
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Aug 18 14:19:00 2011 +0530

    sample-util: Fix off-by-one in error check
    
    Patch by jk.illwinter on http://www.pulseaudio.org/ticket/951

diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index 16ec4ad..a9e486e 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -748,8 +748,8 @@ void pa_volume_memchunk(
         return;
     }
 
-    if (spec->format < 0 || spec->format > PA_SAMPLE_MAX) {
-      pa_log_warn(" Unable to change volume of format %s.", pa_sample_format_to_string(spec->format));
+    if (spec->format < 0 || spec->format >= PA_SAMPLE_MAX) {
+      pa_log_warn("Unable to change volume of format");
       return;
     }