[SCM] pulseaudio packaging branch, master, updated. debian/0.9.22-1-7-g669299a

[crimsun-guest at users.alioth.debian.org]

The branch, master has been updated
       via  669299a7e4853d5563cc4e18d6bceb34efaa160f (commit)
      from  b405f2d9379684c24aabcb46548e502e9b1f5aac (commit)


- Shortlog ------------------------------------------------------------
669299a Backport 1c83b03c (stable-queue) to further clarify src- and speex- references in pulse-daemon.conf (#541206)

Summary of changes:
 ...ex-and-libsamplerate-in-pulse-daemon.conf.patch |   39 +++++++++++++++++---
 1 files changed, 33 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 669299a7e4853d5563cc4e18d6bceb34efaa160f
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Mon Dec 20 21:37:37 2010 -0500

    Backport 1c83b03c (stable-queue) to further clarify src- and speex-
    references in pulse-daemon.conf (#541206)
    
    Based on comments from Arun Raghavan, make clear that we're referring
    to the libspeex API documentation for the speex- options. Also correct
    the quality range (was incorrectly 0..9 but is 0..10 now) and clean up
    the line length.

diff --git a/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch b/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
index e29355e..7adb903 100644
--- a/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
+++ b/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
@@ -1,13 +1,40 @@
 Index: pulseaudio-0.9.22/man/pulse-daemon.conf.5.xml.in
 ===================================================================
---- pulseaudio-0.9.22.orig/man/pulse-daemon.conf.5.xml.in	2010-12-17 20:38:20.000000000 -0500
-+++ pulseaudio-0.9.22/man/pulse-daemon.conf.5.xml.in	2010-12-17 20:40:12.000000000 -0500
-@@ -89,7 +89,7 @@
+--- pulseaudio-0.9.22.orig/man/pulse-daemon.conf.5.xml.in	2010-12-17 20:40:29.000000000 -0500
++++ pulseaudio-0.9.22/man/pulse-daemon.conf.5.xml.in	2010-12-20 21:36:39.000000000 -0500
+@@ -89,20 +89,21 @@
        <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
+-      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
+-      all. The Speex resamplers take an integer quality setting in the
+-      range 0..9 (bad...good). They exist in two flavours: <opt>fixed</opt> and
+-      <opt>float</opt>. The former uses fixed point numbers, the latter relies on
+-      floating point numbers. On most desktop CPUs the float point
+-      resmampler is a lot faster, and it also offers slightly better
+-      quality. See the output of <opt>dump-resample-methods</opt> for
+-      a complete list of all available resamplers. Defaults to
+-      <opt>speex-float-3</opt>. The <opt>--resample-method</opt>
+-      command line option takes precedence. Note that some modules
+-      overwrite or allow overwriting of the resampler to use.</p>
 +      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
++      different src- and speex- methods, respectively. 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 all. The Speex resamplers take an
++      integer quality setting in the range 0..10 (bad...good). They
++      exist in two flavours: <opt>fixed</opt> and <opt>float</opt>. The former uses fixed point
++      numbers, the latter relies on floating point numbers. On most
++      desktop CPUs the float point resampler is a lot faster, and it
++      also offers slightly better quality. See the output of
++      <opt>dump-resample-methods</opt> for a complete list of all
++      available resamplers. Defaults to <opt>speex-float-3</opt>. The
++      <opt>--resample-method</opt> command line option takes precedence.
++      Note that some modules overwrite or allow overwriting of the
++      resampler to use.</p>
+     </option>
+ 
+     <option>

-- 
pulseaudio packaging