[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-57-g78236af

[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  03cd37eb78f470f4b483e14affb633fcd00efd04 (commit)

- Log -----------------------------------------------------------------
78236af... fix copy/paste error
163f107... fix documentation to follow what actually happens
64a2367... inherit proplist on sample playback from client
-----------------------------------------------------------------------

Summary of changes:
 src/pulse/introspect.h          |    4 ++--
 src/pulsecore/protocol-native.c |    2 ++
 src/pulsecore/source-output.c   |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

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

commit 64a23677d36bc0e3069b761c2a8602039d175c5c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 4 23:32:52 2008 +0200

    inherit proplist on sample playback from client

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 0eac3c2..3c3c1e5 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -2432,6 +2432,8 @@ static void command_play_sample(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED ui
         return;
     }
 
+    pa_proplist_update(p, PA_UPDATE_MERGE, c->client->proplist);
+
     if (pa_scache_play_item(c->protocol->core, name, sink, volume, p, &idx) < 0) {
         pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
         pa_proplist_free(p);

commit 163f10712e684fb5614e149d3042aa5dddc7990e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 4 23:33:10 2008 +0200

    fix documentation to follow what actually happens

diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index 35a80f6..ca79f5b 100644
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
@@ -52,14 +52,14 @@
  * Some objects can have multiple entries at the server. When requesting all
  * of these at once, the callback will be called multiple times, once for
  * each object. When the list has been exhausted, the callback will be called
- * without an information structure and the eol parameter set to a non-zero
+ * without an information structure and the eol parameter set to a positive
  * value.
  *
  * Note that even if a single object is requested, and not the entire list,
  * the terminating call will still be made.
  *
  * If an error occurs, the callback will be called without and information
- * structure and eol set to zero.
+ * structure and eol set to a negative value..
  *
  * Data members in the information structures are only valid during the
  * duration of the callback. If they are required after the callback is

commit 78236af7349984c849b40765d6d0393be139fe0f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 4 23:33:29 2008 +0200

    fix copy/paste error

diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 3d1abe3..368c9cf 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -752,7 +752,7 @@ int pa_source_output_process_msg(pa_msgobject *mo, int code, void *userdata, int
             return 0;
         }
 
-        case PA_SINK_INPUT_MESSAGE_GET_REQUESTED_LATENCY: {
+        case PA_SOURCE_OUTPUT_MESSAGE_GET_REQUESTED_LATENCY: {
             pa_usec_t *r = userdata;
 
             *r = o->thread_info.requested_source_latency;

-- 
hooks/post-receive
PulseAudio Sound Server