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

[Peter Meerwald]

 src/modules/rtp/module-rtp-send.c |    2 +-
 src/pulse/context.h               |    2 +-
 src/pulse/def.h                   |    2 +-
 src/pulse/stream.h                |    8 ++++----
 src/pulse/thread-mainloop.h       |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ad61ef4477248fac9dff6eafc9aa0f8671957cd4
Author: Peter Meerwald <pmeerw at pmeerw.net>
Date:   Thu Feb 20 21:41:47 2014 +0100

    doc: Assorted spelling and grammar fixes for doxygen output
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulse/context.h b/src/pulse/context.h
index 3b8b9be..68516a2 100644
--- a/src/pulse/context.h
+++ b/src/pulse/context.h
@@ -87,7 +87,7 @@
  * Whenever the library creates an object, it will have an initial
  * reference count of one. Most of the time, this single reference will be
  * sufficient for the application, so all required reference count
- * interaction will be a single call to the objects unref function.
+ * interaction will be a single call to the object's unref function.
  *
  * \section context_sec Context
  *
diff --git a/src/pulse/def.h b/src/pulse/def.h
index a01c902..d6fa912 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -326,7 +326,7 @@ typedef enum pa_stream_flags {
      * PA_STREAM_ADJUST_LATENCY. \since 0.9.12 */
 
     PA_STREAM_DONT_INHIBIT_AUTO_SUSPEND = 0x8000U,
-    /**< If set this stream won't be taken into account when we it is
+    /**< If set this stream won't be taken into account when it is
      * checked whether the device this stream is connected to should
      * auto-suspend. \since 0.9.15 */
 
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 49f5789..47e0c68 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -127,7 +127,7 @@
  *              (which is recommended) the server will choose the same
  *              value as tlength here.
  *
- * \li minreq - Minimum free number of the bytes in the playback
+ * \li minreq - Minimum number of free bytes in the playback
  *              buffer before the server will request more data. It is
  *              recommended to fill in (uint32_t) -1 here. This value
  *              influences how much time the sound server has to move
@@ -154,13 +154,13 @@
  * PA_STREAM_ADJUST_LATENCY if you want to control the overall
  * playback latency for your stream. Unset it if you want to control
  * only the latency induced by the server-side, rewritable playback
- * buffer. The server will try to fulfill the clients latency requests
+ * buffer. The server will try to fulfill the client's latency requests
  * as good as possible. However if the underlying hardware cannot
  * change the hardware buffer length or only in a limited range, the
  * actually resulting latency might be different from what the client
  * requested. Thus, for synchronization clients always need to check
  * the actual measured latency via pa_stream_get_latency() or a
- * similar call, and not make any assumptions. about the latency
+ * similar call, and not make any assumptions about the latency
  * available. The function pa_stream_get_buffer_attr() will always
  * return the actual size of the server-side per-stream buffer in
  * tlength/fragsize, regardless whether PA_STREAM_ADJUST_LATENCY is
@@ -434,7 +434,7 @@ int pa_stream_is_suspended(pa_stream *s);
 int pa_stream_is_corked(pa_stream *s);
 
 /** Connect the stream to a sink. It is strongly recommended to pass
- * NULL in both \a dev and \a volume and not to set either
+ * NULL in both \a dev and \a volume and to set neither
  * PA_STREAM_START_MUTED nor PA_STREAM_START_UNMUTED -- unless these
  * options are directly dependent on user input or configuration.
  *
diff --git a/src/pulse/thread-mainloop.h b/src/pulse/thread-mainloop.h
index f1636e8..8e8cbfe 100644
--- a/src/pulse/thread-mainloop.h
+++ b/src/pulse/thread-mainloop.h
@@ -226,7 +226,7 @@ PA_C_DECL_BEGIN
  * that they can be called at any time. The threaded main loop API provides
  * the locking mechanism to handle concurrent accesses, but nothing else.
  * Applications will have to handle communication from the callback to the
- * main program through its own mechanisms.
+ * main program through their own mechanisms.
  *
  * The callbacks that are completely asynchronous are:
  *

commit 0c4c2b3110ca2db40be466ca16999ccd67f00f6a
Author: Peter Meerwald <pmeerw at pmeerw.net>
Date:   Fri Jan 3 23:52:19 2014 +0100

    modules: Fix uninitialized variable in rtp-send
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 581e6be..14f00b3 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -281,7 +281,7 @@ int pa__init(pa_module*m) {
         dst_sa6.sin6_family = af = AF_INET6;
         dst_sa6.sin6_port = htons((uint16_t) port);
         dst_sa6.sin6_flowinfo = 0;
-        src_sa6.sin6_scope_id = 0;
+        dst_sa6.sin6_scope_id = 0;
         dst_sap_sa6 = dst_sa6;
         dst_sap_sa6.sin6_port = htons(SAP_PORT);
 #endif