[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v1.0-dev-27-g12c3e97

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  971bbe04a8adc90818a90d989b9895835da823e5 (commit)

- Log -----------------------------------------------------------------
12c3e97 Fix return value of pa_sndfile_format_from_string
ecd46c0 core: Fix variable "has_whined" value bug
62d085f trivial: Mention speex as a resampler reference in pulse-daemon.conf
-----------------------------------------------------------------------

Summary of changes:
 man/pulse-daemon.conf.5.xml.in |    2 +-
 src/pulsecore/random.c         |    2 +-
 src/pulsecore/sndfile-util.c   |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------

commit 62d085fc65945cc58236f3905b7ad1dcda481efe
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Fri Dec 17 23:55:21 2010 -0500

    trivial: Mention speex as a resampler reference in pulse-daemon.conf
    
    A Debian user seemed confused that the man page for pulse-daemon.conf
    does not refer to the libspeex API Resampler for use in PulseAudio's
    *-src. Fix it by explicitly mentioning speex.
    
    (http://bugs.debian.org/541206)
    
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index f2deff1..243c9e2 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -89,7 +89,7 @@ USA.
       <opt>src-zero-order-hold</opt>, <opt>src-linear</opt>,
       <opt>trivial</opt>, <opt>speex-float-N</opt>,
       <opt>speex-fixed-N</opt>, <opt>ffmpeg</opt>. See the
-      documentation of libsamplerate for an explanation for the
+      documentation of libsamplerate and speex for explanations of the
       different src- methods. The method <opt>trivial</opt> is the most basic
       algorithm implemented. If you're tight on CPU consider using
       this. On the other hand it has the worst quality of them

commit ecd46c05d3d56fcab8f58469926cd07057c8dbdf
Author: Yang Xichuan <xichuan.yang at tieto.com>
Date:   Thu Dec 16 11:31:36 2010 +0800

    core: Fix variable "has_whined" value bug
    
    In the file src/pulsecore/random.c
    
    I found that the log information "Failed to get proper entropy. Falling
    back to seeding with current time." would never be printed.
    
    This change corrects the issue.

diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c
index a87d24e..3d159bf 100644
--- a/src/pulsecore/random.c
+++ b/src/pulsecore/random.c
@@ -37,7 +37,7 @@
 
 #include "random.h"
 
-static pa_bool_t has_whined = TRUE;
+static pa_bool_t has_whined = FALSE;
 
 static const char * const devices[] = { "/dev/urandom", "/dev/random", NULL };
 

commit 12c3e97bb4ebca02a94bdf4b719fd50c72dfbdba
Author: Vincent Becker <vincentx.becker at intel.com>
Date:   Tue Dec 14 18:08:14 2010 +0100

    Fix return value of pa_sndfile_format_from_string
    
    This prevented to use pacat --file-format option correctly

diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index 4f7f8bd..9d15a86 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -416,7 +416,7 @@ int pa_sndfile_format_from_string(const char *name) {
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
         if (strcasecmp(name, fi.name) == 0)
-            return i;
+            return fi.format;
     }
 
     /* Then, try to match via the full extension */
@@ -428,7 +428,7 @@ int pa_sndfile_format_from_string(const char *name) {
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
         if (strcasecmp(name, fi.extension) == 0)
-            return i;
+            return fi.format;
     }
 
     /* Then, try to match via the start of the type string */
@@ -440,7 +440,7 @@ int pa_sndfile_format_from_string(const char *name) {
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
         if (strncasecmp(name, fi.extension, strlen(name)) == 0)
-            return i;
+            return fi.format;
     }
 
     return -1;

-- 
hooks/post-receive
PulseAudio Sound Server