[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test5-93-g1743322

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  061344fbd78f4a643f4e2a12b24c5d1ae1622e04 (commit)

- Log -----------------------------------------------------------------
1743322 Merge commit 'coling/master'
205cbe8 raop: Add call to pa_sink_set_max_request()
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-raop-sink.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit 205cbe8afcf83ac7392b90ba8c73f40b798104c6
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Wed Mar 25 23:05:41 2009 +0000

    raop: Add call to pa_sink_set_max_request()
    
    This is just a copy from the ESD version which is a little crude, but will do for now.

diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index 00f0c63..d8ddf18 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -135,13 +135,22 @@ enum {
 /* Forward declaration */
 static void sink_set_volume_cb(pa_sink *);
 
-static void on_connection(PA_GCC_UNUSED int fd, void*userdata) {
+static void on_connection(int fd, void*userdata) {
+    int so_sndbuf = 0;
+    socklen_t sl = sizeof(int);
     struct userdata *u = userdata;
     pa_assert(u);
 
     pa_assert(u->fd < 0);
     u->fd = fd;
 
+    if (getsockopt(u->fd, SOL_SOCKET, SO_SNDBUF, &so_sndbuf, &sl) < 0)
+        pa_log_warn("getsockopt(SO_SNDBUF) failed: %s", pa_cstrerror(errno));
+    else {
+        pa_log_debug("SO_SNDBUF is %zu.", (size_t) so_sndbuf);
+        pa_sink_set_max_request(u->sink, PA_MAX((size_t) so_sndbuf, u->block_size));
+    }
+
     /* Set the initial volume */
     sink_set_volume_cb(u->sink);
 

commit 1743322d3e184d57a80cd58e9bcfb0bf01bd4c67
Merge: 061344f 205cbe8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 30 19:15:39 2009 +0200

    Merge commit 'coling/master'


-- 
hooks/post-receive
PulseAudio Sound Server