[pulseaudio-commits] Branch 'next' - 2 commits - src/pulsecore

[David Henningsson]

 src/pulsecore/pstream.c       |    6 +++---
 src/pulsecore/socket-server.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 46a3726a58efc0517b44be7bc572943bd44f7e2e
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Apr 5 16:48:21 2013 +0200

    socket-server: Make the new channel low-delay, not the listening one
    
    I don't know if it matters a lot, but most certainly it must be
    the new channel that's supposed to be made low-delay, not the existing
    listening socket, right?
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c
index 0b0b2a5..74db9e3 100644
--- a/src/pulsecore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -133,9 +133,9 @@ static void callback(pa_mainloop_api *mainloop, pa_io_event *e, int fd, pa_io_ev
 
     /* There should be a check for socket type here */
     if (s->type == SOCKET_SERVER_IPV4)
-        pa_make_tcp_socket_low_delay(fd);
+        pa_make_tcp_socket_low_delay(nfd);
     else
-        pa_make_socket_low_delay(fd);
+        pa_make_socket_low_delay(nfd);
 
     pa_assert_se(io = pa_iochannel_new(s->mainloop, nfd, nfd));
     s->on_connection(s, io, s->userdata);

commit b13d7000181324073a64ffe93029079224612a1f
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Apr 5 11:17:55 2013 +0200

    pstream: Rename "do_something" function
    
    Rename it to "do_pstream_read_write" that better describes what the
    function does.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index c0262a7..7538a86 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -168,7 +168,7 @@ struct pa_pstream {
 static int do_write(pa_pstream *p);
 static int do_read(pa_pstream *p);
 
-static void do_something(pa_pstream *p) {
+static void do_pstream_read_write(pa_pstream *p) {
     pa_assert(p);
     pa_assert(PA_REFCNT_VALUE(p) > 0);
 
@@ -206,7 +206,7 @@ static void io_callback(pa_iochannel*io, void *userdata) {
     pa_assert(PA_REFCNT_VALUE(p) > 0);
     pa_assert(p->io == io);
 
-    do_something(p);
+    do_pstream_read_write(p);
 }
 
 static void defer_callback(pa_mainloop_api *m, pa_defer_event *e, void*userdata) {
@@ -217,7 +217,7 @@ static void defer_callback(pa_mainloop_api *m, pa_defer_event *e, void*userdata)
     pa_assert(p->defer_event == e);
     pa_assert(p->mainloop == m);
 
-    do_something(p);
+    do_pstream_read_write(p);
 }
 
 static void memimport_release_cb(pa_memimport *i, uint32_t block_id, void *userdata);