[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-2-gf6670a1

[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  5538c184167865754287e6fe30b4eef257dbe695 (commit)

- Log -----------------------------------------------------------------
f6670a1... stream_started_callback userdata bug
636b520... fix S32 validity check
-----------------------------------------------------------------------

Summary of changes:
 src/pulse/stream.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

commit 636b520d745397841373bdf4112e24ff443c0359
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Sep 10 12:18:05 2008 +0300

    fix S32 validity check

diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index d0c7d67..5be6007 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -86,7 +86,7 @@ pa_stream *pa_stream_new_with_proplist(
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, ss && pa_sample_spec_valid(ss), PA_ERR_INVALID);
-    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 12 || (ss->format != PA_SAMPLE_S32LE || ss->format != PA_SAMPLE_S32NE), PA_ERR_NOTSUPPORTED);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 12 || (ss->format != PA_SAMPLE_S32LE && ss->format != PA_SAMPLE_S32BE), PA_ERR_NOTSUPPORTED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, !map || (pa_channel_map_valid(map) && map->channels == ss->channels), PA_ERR_INVALID);
     PA_CHECK_VALIDITY_RETURN_NULL(c, name || (p && pa_proplist_contains(p, PA_PROP_MEDIA_NAME)), PA_ERR_INVALID);
 

commit f6670a1f2e0407e22226713bdf6fc6db68383b68
Author: Arthur Taylor <theycallhimart at gmail.com>
Date:   Tue Sep 9 20:28:20 2008 -0700

    stream_started_callback userdata bug
    
    Hello
    
    I came across a bug where the userdata parameter of the
    stream_started_callback was always NULL in some cases. I couldn't seem
    to make a ticket, so here's the one line patch:
    
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 5be6007..6890b7a 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -557,7 +557,7 @@ void pa_command_stream_started(pa_pdispatch *pd, uint32_t command, uint32_t tag,
     request_auto_timing_update(s, TRUE);
 
     if (s->started_callback)
-        s->started_callback(s, s->suspended_userdata);
+        s->started_callback(s, s->started_userdata);
 
 finish:
     pa_context_unref(c);

-- 
hooks/post-receive
PulseAudio Sound Server