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

[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  98a5f4a9919c67792f3bbf01ee5ed7e666b8b216 (commit)

- Log -----------------------------------------------------------------
119698a beef up esd sink properties a bit
fdbe054 initialize max_request to SO_SNDBUF
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-esound-sink.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

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

commit fdbe0543be395b7baa4b8228a035529135b8b4c1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 25 01:17:56 2009 +0100

    initialize max_request to SO_SNDBUF

diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 2b45e30..a27de4c 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -354,6 +354,9 @@ static int do_write(struct userdata *u) {
     }
 
     if (!u->write_data && u->state == STATE_PREPARE) {
+        int so_sndbuf = 0;
+        socklen_t sl = sizeof(int);
+
         /* OK, we're done with sending all control data we need to, so
          * let's hand the socket over to the IO thread now */
 
@@ -366,6 +369,13 @@ static int do_write(struct userdata *u) {
 
         pa_make_tcp_socket_low_delay(u->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));
+        }
+
         pa_log_debug("Connection authenticated, handing fd to IO thread...");
 
         pa_asyncmsgq_post(u->thread_mq.inq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_PASS_SOCKET, NULL, 0, NULL, NULL);

commit 119698ae91dfe525c1934d0d4035d2c6250ad79c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 25 01:18:29 2009 +0100

    beef up esd sink properties a bit

diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index a27de4c..5c47f44 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -576,7 +576,8 @@ int pa__init(pa_module*m) {
     pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
     pa_sink_new_data_set_sample_spec(&data, &ss);
     pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, espeaker);
-    pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Esound sink '%s'", espeaker);
+    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_API, "esd");
+    pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "EsounD Output on %s", espeaker);
 
     u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_NETWORK);
     pa_sink_new_data_done(&data);

-- 
hooks/post-receive
PulseAudio Sound Server