Merge branch 'master' of git://0pointer.de/pulseaudio

4 files changed, 6 insertions, 5 deletions

diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c
index 138ed838..57cb57c8 100644
--- a/src/pulse/ext-device-manager.c
+++ b/src/pulse/ext-device-manager.c
@@ -128,21 +128,18 @@ static void ext_device_manager_read_cb(pa_pdispatch *pd, uint32_t command, uint3
 
         while (!pa_tagstruct_eof(t)) {
             pa_ext_device_manager_info i;
-            pa_bool_t available;
 
             memset(&i, 0, sizeof(i));
-            available = FALSE;
 
             if (pa_tagstruct_gets(t, &i.name) < 0 ||
                 pa_tagstruct_gets(t, &i.description) < 0 ||
                 pa_tagstruct_gets(t, &i.icon) < 0 ||
-                pa_tagstruct_get_boolean(t, &available) < 0 ||
+                pa_tagstruct_getu32(t, &i.index) < 0 ||
                 pa_tagstruct_getu32(t, &i.n_role_priorities) < 0) {
 
                 pa_context_fail(o->context, PA_ERR_PROTOCOL);
                 goto finish;
             }
-            i.available = (uint8_t)available;
 
             if (i.n_role_priorities > 0) {
                 uint32_t j;
diff --git a/src/pulse/ext-device-manager.h b/src/pulse/ext-device-manager.h
index 13538f0c..1442a1a9 100644
--- a/src/pulse/ext-device-manager.h
+++ b/src/pulse/ext-device-manager.h
@@ -44,7 +44,7 @@ typedef struct pa_ext_device_manager_info {
     const char *name;            /**< Identifier string of the device. A string like "sink:" or similar followed by the name of the device. */
     const char *description;     /**< The description of the device when it was last seen, if applicable and saved */
     const char *icon;            /**< The icon given to the device */
-    uint8_t available;           /**< Is the device currently available? */
+    uint32_t index;              /**< The device index if it is currently available or PA_INVALID_INDEX */
     uint32_t n_role_priorities;  /**< How many role priorities do we have? */
     pa_ext_device_manager_role_priority_info *role_priorities; /**< An array of role priority structures or NULL */
 } pa_ext_device_manager_info;
diff --git a/src/pulse/ext-stream-restore.h b/src/pulse/ext-stream-restore.h
index 0b5d8eb6..54516f63 100644
--- a/src/pulse/ext-stream-restore.h
+++ b/src/pulse/ext-stream-restore.h
@@ -24,6 +24,8 @@
 
 #include <pulse/context.h>
 #include <pulse/version.h>
+#include <pulse/volume.h>
+#include <pulse/channelmap.h>
 
 /** \file
  *
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 21dd0a85..2e8e71a0 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -31,6 +31,8 @@
 #include <pulse/def.h>
 #include <pulse/cdecl.h>
 #include <pulse/operation.h>
+#include <pulse/context.h>
+#include <pulse/proplist.h>
 
 /** \page streams Audio Streams
  *