[pulseaudio-commits] 3 commits - PROTOCOL src/modules src/pulse src/pulsecore

[Peter Meerwald]

 PROTOCOL                               |    2 +-
 src/modules/module-tunnel-source-new.c |   12 ++++++------
 src/pulse/def.h                        |    2 +-
 src/pulse/stream.h                     |    2 +-
 src/pulsecore/sink-input.c             |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 89749a5379c4191e39d8ce2c4b33f5a761182da3
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Thu Mar 6 13:15:12 2014 +0100

    tunnel-source-new: Fix shadow compiler warning
    
      CC     modules/module_tunnel_sink_la-module-tunnel.lo
    modules/module-tunnel-source-new.c: In function 'read_new_samples':
    modules/module-tunnel-source-new.c:145:16: warning: declaration of 'read' shadows a global declaration [-Wshadow]
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/modules/module-tunnel-source-new.c b/src/modules/module-tunnel-source-new.c
index d2e2d6c..aacb723 100644
--- a/src/modules/module-tunnel-source-new.c
+++ b/src/modules/module-tunnel-source-new.c
@@ -142,8 +142,8 @@ static void read_new_samples(struct userdata *u) {
 
     readable = pa_stream_readable_size(u->stream);
     while (readable > 0) {
-        size_t read = 0;
-        if (PA_UNLIKELY(pa_stream_peek(u->stream, &p, &read) != 0)) {
+        size_t nbytes = 0;
+        if (PA_UNLIKELY(pa_stream_peek(u->stream, &p, &nbytes) != 0)) {
             pa_log("pa_stream_peek() failed: %s", pa_strerror(pa_context_errno(u->context)));
             u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
             return;
@@ -151,14 +151,14 @@ static void read_new_samples(struct userdata *u) {
 
         if (PA_LIKELY(p)) {
             /* we have valid data */
-            memchunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, (void *) p, read, true);
-            memchunk.length = read;
+            memchunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, (void *) p, nbytes, true);
+            memchunk.length = nbytes;
             memchunk.index = 0;
 
             pa_source_post(u->source, &memchunk);
             pa_memblock_unref_fixed(memchunk.memblock);
         } else {
-            size_t bytes_to_generate = read;
+            size_t bytes_to_generate = nbytes;
 
             /* we have a hole. generate silence */
             memchunk = u->source->silence;
@@ -176,7 +176,7 @@ static void read_new_samples(struct userdata *u) {
         }
 
         pa_stream_drop(u->stream);
-        readable -= read;
+        readable -= nbytes;
     }
 }
 

commit 73a6a169b22babc7e75e171a12559cb5b8407636
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Thu Mar 6 10:31:32 2014 +0100

    doc: Fix pa_stream_set_latency_update_callback() documentation
    
    the latency_update callback is supported on playback AND record
    streams
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 47e0c68..7ceb569 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -628,7 +628,7 @@ void pa_stream_set_started_callback(pa_stream *p, pa_stream_notify_cb_t cb, void
 
 /** Set the callback function that is called whenever a latency
  * information update happens. Useful on PA_STREAM_AUTO_TIMING_UPDATE
- * streams only. (Only for playback streams) */
+ * streams only. */
 void pa_stream_set_latency_update_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
 
 /** Set the callback function that is called whenever the stream is

commit 679eed5340595d47bec1d38ae8b7511d493d95e7
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Thu Mar 6 10:25:35 2014 +0100

    doc: Fix a couple of 'to to' typos
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/PROTOCOL b/PROTOCOL
index 0673d86..850b953 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -30,7 +30,7 @@ SHM data transfer support
 
 ### v11, implemented by >= 0.9.7
 
-Reply to to PA_COMMAND_GET_SINK_INPUT_INFO, PA_COMMAND_GET_SINK_INPUT_INFO_LIST gets new field at the end:
+Reply to PA_COMMAND_GET_SINK_INPUT_INFO, PA_COMMAND_GET_SINK_INPUT_INFO_LIST gets new field at the end:
 
  mute
 
diff --git a/src/pulse/def.h b/src/pulse/def.h
index d6fa912..dfc0c10 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -197,7 +197,7 @@ typedef enum pa_stream_flags {
      * return always monotonically increasing time values on each
      * call. This may confuse applications which cannot deal with time
      * going 'backwards', but has the advantage that bad transport
-     * latency estimations that caused the time to to jump ahead can
+     * latency estimations that caused the time to jump ahead can
      * be corrected quickly, without the need to wait. (Please note
      * that this flag was named PA_STREAM_NOT_MONOTONOUS in releases
      * prior to 0.9.11. The old name is still defined too, for
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index f85b2c7..fb2a893 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1096,7 +1096,7 @@ void pa_sink_input_process_rewind(pa_sink_input *i, size_t nbytes /* in sink sam
                 i->process_rewind(i, amount);
             called = true;
 
-            /* Convert back to to sink domain */
+            /* Convert back to sink domain */
             if (i->thread_info.resampler)
                 amount = pa_resampler_result(i->thread_info.resampler, amount);