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

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

- Log -----------------------------------------------------------------
ca12753... add a function to dump the stream database for debugging purposes
8a156d1... don't enforce valid callbacks for extension module APIs
98b8163... allow extension messages to actually carry information
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-stream-restore.c |   32 ++++++++++++++++++++++++++++++++
 src/pulse/context.c                 |    3 +--
 src/pulse/ext-stream-restore.c      |    5 -----
 3 files changed, 33 insertions(+), 7 deletions(-)

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

commit 98b81636b7d3ba4a49f1c23118a669c8472961de
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 5 19:01:25 2008 +0200

    allow extension messages to actually carry information

diff --git a/src/pulse/context.c b/src/pulse/context.c
index b20093d..f7b3296 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -1251,8 +1251,7 @@ void pa_command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t
     pa_context_ref(c);
 
     if (pa_tagstruct_getu32(t, &idx) < 0 ||
-        pa_tagstruct_gets(t, &name) < 0 ||
-        !pa_tagstruct_eof(t)) {
+        pa_tagstruct_gets(t, &name) < 0) {
         pa_context_fail(c, PA_ERR_PROTOCOL);
         goto finish;
     }

commit 8a156d1a23359d3b4d4b0cf44be1b40e77b5db03
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 5 19:01:51 2008 +0200

    don't enforce valid callbacks for extension module APIs

diff --git a/src/pulse/ext-stream-restore.c b/src/pulse/ext-stream-restore.c
index c9f70bf..703179c 100644
--- a/src/pulse/ext-stream-restore.c
+++ b/src/pulse/ext-stream-restore.c
@@ -85,7 +85,6 @@ pa_operation *pa_ext_stream_restore_test(
 
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
-    pa_assert(cb);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 14, PA_ERR_NOTSUPPORTED);
@@ -166,7 +165,6 @@ pa_operation *pa_ext_stream_restore_read(
 
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
-    pa_assert(cb);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 14, PA_ERR_NOTSUPPORTED);
@@ -200,7 +198,6 @@ pa_operation *pa_ext_stream_restore_write(
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
     pa_assert(mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE || mode == PA_UPDATE_SET);
     pa_assert(data);
-    pa_assert(cb);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 14, PA_ERR_NOTSUPPORTED);
@@ -243,7 +240,6 @@ pa_operation *pa_ext_stream_restore_delete(
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
     pa_assert(s);
-    pa_assert(cb);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 14, PA_ERR_NOTSUPPORTED);
@@ -276,7 +272,6 @@ pa_operation *pa_ext_stream_restore_subscribe(
 
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
-    pa_assert(cb);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 14, PA_ERR_NOTSUPPORTED);

commit ca127532fcddd28cc40bbbe0646a1205b365ffb7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 5 19:03:11 2008 +0200

    add a function to dump the stream database for debugging purposes

diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index ee6fab4..b6d7b0f 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -455,6 +455,38 @@ static void apply_entry(struct userdata *u, const char *name, struct entry *e) {
     }
 }
 
+#if 0
+static void dump_database(struct userdata *u) {
+    datum key;
+
+    key = gdbm_firstkey(u->gdbm_file);
+    while (key.dptr) {
+        datum next_key;
+        struct entry *e;
+        char *name;
+
+        next_key = gdbm_nextkey(u->gdbm_file, key);
+
+        name = pa_xstrndup(key.dptr, key.dsize);
+        pa_xfree(key.dptr);
+
+        if ((e = read_entry(u, name))) {
+            char t[256];
+            pa_log("name=%s", name);
+            pa_log("device=%s", e->device);
+            pa_log("channel_map=%s", pa_channel_map_snprint(t, sizeof(t), &e->channel_map));
+            pa_log("volume=%s", pa_cvolume_snprint(t, sizeof(t), &e->volume));
+            pa_log("mute=%s", pa_yes_no(e->muted));
+            pa_xfree(e);
+        }
+
+        pa_xfree(name);
+
+        key = next_key;
+    }
+}
+#endif
+
 static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connection *c, uint32_t tag, pa_tagstruct *t) {
     struct userdata *u;
     uint32_t command;

-- 
hooks/post-receive
PulseAudio Sound Server