[pulseaudio-commits] Branch 'next' - 3 commits - man/default.pa.5.xml.in src/.gitignore src/pulsecore

[David Henningsson]

 man/default.pa.5.xml.in |    2 +-
 src/.gitignore          |    1 +
 src/pulsecore/pstream.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 14cf9aa3fcfbbc05ac28644067b9f5a1063e51a7
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 15:07:30 2013 +0200

    doc: Mention just one CLI language in default.pa.5
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index 8159593..5690541 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -33,7 +33,7 @@ USA.
     <p>The PulseAudio sound server interprets the file
     <file>~/.config/pulse/default.pa</file> on startup, and when that file
     doesn't exist <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. It
-    should contain directives in the PulseAudio CLI languages, as
+    should contain directives in the PulseAudio CLI language, as
     documented in <manref name="pulse-cli-syntax" section="5"/>.</p>
 
     <p>The same commands can also be entered during runtime in the <manref name="pacmd"

commit 300867488c98c54195de539e916a2b09c7387619
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 15:16:36 2013 +0200

    pstream: Fix case in log message
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index d92178f..9463437 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -754,7 +754,7 @@ static int do_read(pa_pstream *p) {
             if ((flags & PA_FLAG_SHMMASK) == PA_FLAG_SHMDATA) {
 
                 if (length != sizeof(p->read.shm_info)) {
-                    pa_log_warn("Received SHM memblock frame with Invalid frame length.");
+                    pa_log_warn("Received SHM memblock frame with invalid frame length.");
                     return -1;
                 }
 

commit 8a64d4ab1f0acd097d69f1a409ec63601cf1a734
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 09:49:03 2013 +0200

    .gitignore: Ignore src/*.gcno files created when building with --enable-gcov
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/src/.gitignore b/src/.gitignore
index cd9c51a..24046ff 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,6 +2,7 @@ TAGS
 *.lo
 *.o
 *.la
+*.gcno
 .deps
 .libs
 /Makefile