From 0cc674d96198b26cec81b38c32232e95735e4cca Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Aug 2008 19:02:20 +0200
Subject: wrap protocol extension of module-stream-restore

---
 src/pulse/internal.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/pulse/internal.h')

diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 9ed541d1..bfe888ee 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -28,6 +28,7 @@
 #include <pulse/stream.h>
 #include <pulse/operation.h>
 #include <pulse/subscribe.h>
+#include <pulse/ext-stream-restore.h>
 
 #include <pulsecore/socket-client.h>
 #include <pulsecore/pstream.h>
@@ -86,6 +87,12 @@ struct pa_context {
     pa_client_conf *conf;
 
     uint32_t client_index;
+
+    /* Extension specific data */
+    struct {
+        pa_ext_stream_restore_subscribe_cb_t callback;
+        void *userdata;
+    } ext_stream_restore;
 };
 
 #define PA_MAX_WRITE_INDEX_CORRECTIONS 32
@@ -233,4 +240,6 @@ pa_tagstruct *pa_tagstruct_command(pa_context *c, uint32_t command, uint32_t *ta
 
 #define PA_CHECK_VALIDITY_RETURN_NULL(context, expression, error) PA_CHECK_VALIDITY_RETURN_ANY(context, expression, error, NULL)
 
+void pa_ext_stream_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t);
+
 #endif
-- 
cgit 


From 15cebbacebf27703848afb18883fad7984349f04 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 9 Aug 2008 03:49:42 +0200
Subject: rework autospawning code to survive multiple pa_contexts in a single
 process

---
 src/pulse/internal.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/pulse/internal.h')

diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index bfe888ee..26fb04d4 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -75,9 +75,12 @@ struct pa_context {
     pa_mempool *mempool;
 
     pa_bool_t is_local:1;
-    pa_bool_t do_autospawn:1;
     pa_bool_t do_shm:1;
-    int autospawn_lock_fd;
+
+    pa_bool_t do_autospawn:1;
+    pa_bool_t autospawn_locked:1;
+    int autospawn_fd;
+    pa_io_event *autospawn_event;
     pa_spawn_api spawn_api;
 
     pa_strlist *server_list;
-- 
cgit 


From b7026bf248948a6a30386ddbcc137f48f369a51e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Aug 2008 22:39:54 +0200
Subject: add a few more gcc warning flags and fix quite a few problems found
 by doing so

---
 src/pulse/internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pulse/internal.h')

diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 26fb04d4..9167bf1b 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -64,7 +64,7 @@ struct pa_context {
     uint32_t version;
     uint32_t ctag;
     uint32_t csyncid;
-    uint32_t error;
+    int error;
     pa_context_state_t state;
 
     pa_context_notify_cb_t state_callback;
-- 
cgit