[pulseaudio-commits] 2 commits - src/pulsecore

[Peter Meerwald]

 src/pulsecore/core.c       |    4 ++--
 src/pulsecore/creds.h      |    2 +-
 src/pulsecore/pdispatch.c  |    5 +++++
 src/pulsecore/srbchannel.c |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 9ae5a03a32039718435202debe89181a13ea603f
Author: Peter Meerwald <pmeerw at pmeerw.net>
Date:   Tue Jun 17 00:20:54 2014 +0200

    core: Add SRBCHANNEL command names for debug
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulsecore/pdispatch.c b/src/pulsecore/pdispatch.c
index 483ce6b..bbf6de8 100644
--- a/src/pulsecore/pdispatch.c
+++ b/src/pulsecore/pdispatch.c
@@ -192,6 +192,11 @@ static const char *command_names[PA_COMMAND_MAX] = {
 
     /* Supported since protocol v27 (3.0) */
     [PA_COMMAND_SET_PORT_LATENCY_OFFSET] = "SET_PORT_LATENCY_OFFSET",
+
+    /* Supported since protocol v30 (6.0) */
+    /* BOTH DIRECTIONS */
+    [PA_COMMAND_ENABLE_SRBCHANNEL] = "ENABLE_SRBCHANNEL",
+    [PA_COMMAND_DISABLE_SRBCHANNEL] = "DISABLE_SRBCHANNEL",
 };
 
 #endif

commit f79b1bc3d9db1289fba4e8caadce4f4969dcaab3
Author: Peter Meerwald <pmeerw at pmeerw.net>
Date:   Tue Jun 17 00:16:50 2014 +0200

    core: Misc srbchannel cleanup
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index b0f2314..e461963 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -72,7 +72,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) {
 
     if (shared) {
         if (!(pool = pa_mempool_new(shared, shm_size))) {
-            pa_log_warn("failed to allocate shared memory pool. Falling back to a normal memory pool.");
+            pa_log_warn("Failed to allocate shared memory pool. Falling back to a normal memory pool.");
             shared = false;
         }
     }
@@ -128,7 +128,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) {
     pa_silence_cache_init(&c->silence_cache);
 
     if (shared && !(c->rw_mempool = pa_mempool_new(shared, shm_size)))
-        pa_log_warn("failed to allocate shared writable memory pool.");
+        pa_log_warn("Failed to allocate shared writable memory pool.");
     if (c->rw_mempool)
         pa_mempool_set_is_remote_writable(c->rw_mempool, true);
 
diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
index f09b35e..06806bc 100644
--- a/src/pulsecore/creds.h
+++ b/src/pulsecore/creds.h
@@ -31,7 +31,7 @@
 #include <pulsecore/socket.h>
 #include <stdbool.h>
 
-#define MAX_ANCIL_FDS (2)
+#define MAX_ANCIL_FDS 2
 
 typedef struct pa_creds pa_creds;
 typedef struct pa_ancil pa_ancil;
diff --git a/src/pulsecore/srbchannel.c b/src/pulsecore/srbchannel.c
index 5fe2220..87eeae0 100644
--- a/src/pulsecore/srbchannel.c
+++ b/src/pulsecore/srbchannel.c
@@ -127,7 +127,7 @@ size_t pa_srbchannel_read(pa_srbchannel *sr, void *data, size_t l) {
         memcpy(data, ptr, toread);
         if (pa_ringbuffer_drop(&sr->rb_read, toread)) {
 #ifdef DEBUG_SRBCHANNEL
-            pa_log("read from full output buffer, signalling fdsem");
+            pa_log("Read from full output buffer, signalling fdsem");
 #endif
             pa_fdsem_post(sr->sem_write);
         }