fix includes

pipewire-alsa

@@ -1 +1 @@
-Subproject commit dddaaf4db427cb5b9bc5cc273bff00bfdb75d7c7
+Subproject commit a52d6bc2d3989cfc2bf75639e9a81941c0b685ed

pipewire-pulseaudio

@@ -1 +1 @@
-Subproject commit 694ae6dd84dc4f98add11474607d8e211bd4ae4a
+Subproject commit 772ec76cd90b4ac089e6903d4a078088cd02e14d

spa/examples/example-control.c

@@ -32,6 +32,7 @@
 #include <pthread.h>
 #include <poll.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log-impl.h>
 #include <spa/support/loop.h>
 #include <spa/node/node.h>
@@ -41,6 +42,7 @@
 #include <spa/param/props.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 
 #define M_PI_M2 ( M_PI + M_PI )
 

spa/examples/local-v4l2.c

@@ -34,7 +34,9 @@
 
 #include <SDL2/SDL.h>
 
+#include <spa/support/plugin.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 #include <spa/support/log-impl.h>
 #include <spa/support/loop.h>
 #include <spa/node/node.h>

spa/include/spa/monitor/device.h

@@ -30,9 +30,8 @@ extern "C" {
 #endif
 
 #include <spa/utils/defs.h>
+#include <spa/utils/hook.h>
 #include <spa/utils/dict.h>
-#include <spa/support/plugin.h>
-#include <spa/pod/builder.h>
 #include <spa/pod/event.h>
 
 /**

spa/include/spa/monitor/utils.h

@@ -29,6 +29,7 @@
 extern "C" {
 #endif
 
+#include <spa/pod/builder.h>
 #include <spa/monitor/device.h>
 
 struct spa_result_device_params_data {

spa/include/spa/node/event.h

@@ -29,9 +29,7 @@
 extern "C" {
 #endif
 
-#include <spa/utils/defs.h>
 #include <spa/pod/event.h>
-#include <spa/node/node.h>
 
 /* object id of SPA_TYPE_EVENT_Node */
 enum spa_node_event {

spa/include/spa/node/node.h

@@ -30,9 +30,12 @@ extern "C" {
 #endif
 
 #include <spa/utils/defs.h>
-#include <spa/utils/result.h>
 #include <spa/utils/type.h>
 #include <spa/utils/hook.h>
+#include <spa/buffer/buffer.h>
+#include <spa/node/event.h>
+#include <spa/node/command.h>
+
 
 /**
  * A spa_node is a component that can consume and produce buffers.
@@ -40,12 +43,6 @@ extern "C" {
 #define SPA_VERSION_NODE	0
 struct spa_node { struct spa_interface iface; };
 
-#include <spa/support/plugin.h>
-
-#include <spa/buffer/buffer.h>
-#include <spa/node/event.h>
-#include <spa/node/command.h>
-
 /**
  * Node information structure
  *

spa/include/spa/param/type-info.h

@@ -32,7 +32,6 @@ extern "C" {
 #include <spa/utils/defs.h>
 #include <spa/param/props.h>
 #include <spa/param/format.h>
-#include <spa/node/io.h>
 #include <spa/buffer/type-info.h>
 
 /* base for parameter object enumerations */

spa/include/spa/support/loop.h

@@ -31,7 +31,6 @@ extern "C" {
 
 #include <spa/utils/defs.h>
 #include <spa/utils/hook.h>
-#include <spa/utils/result.h>
 #include <spa/support/system.h>
 
 #define SPA_VERSION_LOOP		0

spa/include/spa/support/system.h

@@ -33,7 +33,6 @@ extern "C" {
 
 #include <spa/utils/defs.h>
 #include <spa/utils/hook.h>
-#include <spa/utils/result.h>
 
 /**
  * a collection of core system functions

spa/include/spa/utils/defs.h

@@ -236,14 +236,6 @@ struct spa_param_info {
 #define spa_memzero(x,l) (memset((x), 0, (l)))
 #define spa_zero(x) (spa_memzero(&(x), sizeof(x)))
 
-#define spa_strerror(err)		\
-({					\
-	int _err = -err;		\
-	if (SPA_RESULT_IS_ASYNC(err))	\
-		_err = EINPROGRESS;	\
-	strerror(_err);			\
-})
-
 #ifdef SPA_DEBUG_MEMCPY
 #define spa_memcpy(d,s,n)						\
 ({									\

spa/include/spa/utils/result.h

@@ -43,6 +43,14 @@ extern "C" {
 #define SPA_RESULT_ASYNC_SEQ(res)	((res) & SPA_ASYNC_SEQ_MASK)
 #define SPA_RESULT_RETURN_ASYNC(seq)	(SPA_ASYNC_BIT | SPA_RESULT_ASYNC_SEQ(seq))
 
+#define spa_strerror(err)		\
+({					\
+	int _err = -err;		\
+	if (SPA_RESULT_IS_ASYNC(err))	\
+		_err = EINPROGRESS;	\
+	strerror(_err);			\
+})
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

spa/plugins/alsa/alsa-pcm.h

@@ -34,6 +34,7 @@ extern "C" {
 
 #include <alsa/asoundlib.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
 #include <spa/utils/list.h>

spa/plugins/alsa/alsa-seq.c

@@ -32,6 +32,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include <spa/utils/result.h>
 #include <spa/pod/filter.h>
 #include <spa/support/system.h>
 #include <spa/control/control.h>

spa/plugins/alsa/alsa-seq.h

@@ -34,6 +34,7 @@ extern "C" {
 
 #include <alsa/asoundlib.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
 #include <spa/utils/list.h>

spa/plugins/audioconvert/audioadapter.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 
@@ -29,6 +30,7 @@
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 #include <spa/buffer/alloc.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/filter.h>

spa/plugins/audioconvert/audioconvert.c

@@ -26,8 +26,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
+#include <spa/utils/result.h>
 #include <spa/utils/list.h>
 #include <spa/utils/names.h>
 #include <spa/node/node.h>

spa/plugins/audioconvert/channelmix.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 #include <spa/utils/list.h>

spa/plugins/audioconvert/fmtconvert.c

@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <limits.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 #include <spa/utils/list.h>

spa/plugins/audioconvert/merger.c

@@ -27,8 +27,10 @@
 #include <stdio.h>
 #include <limits.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/cpu.h>
 #include <spa/support/log.h>
+#include <spa/utils/result.h>
 #include <spa/utils/list.h>
 #include <spa/utils/names.h>
 #include <spa/node/node.h>

spa/plugins/audioconvert/resample.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/utils/list.h>
 #include <spa/utils/names.h>

spa/plugins/audioconvert/splitter.c

@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <limits.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/cpu.h>
 #include <spa/support/log.h>
 #include <spa/utils/list.h>

spa/plugins/audioconvert/test-source.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 #include <spa/utils/list.h>

spa/plugins/audiomixer/audiomixer.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 #include <spa/utils/list.h>

spa/plugins/audiomixer/mixer-dsp.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 #include <spa/utils/list.h>

spa/plugins/bluez5/a2dp-sink.c

@@ -28,12 +28,14 @@
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
 #include <spa/support/system.h>
 #include <spa/utils/list.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 #include <spa/monitor/device.h>
 
 #include <spa/node/node.h>

spa/plugins/bluez5/a2dp-source.c

@@ -31,12 +31,14 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
 #include <spa/support/system.h>
 #include <spa/utils/list.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 #include <spa/monitor/device.h>
 
 #include <spa/node/node.h>

spa/plugins/bluez5/sco-sink.c

@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
 #include <spa/support/system.h>

spa/plugins/bluez5/sco-source.c

@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
 #include <spa/support/system.h>

spa/plugins/control/mixer.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 #include <spa/utils/list.h>

spa/plugins/jack/jack-device.c

@@ -33,6 +33,7 @@
 #include <spa/utils/type.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 #include <spa/support/loop.h>
 #include <spa/support/plugin.h>
 #include <spa/monitor/device.h>

spa/plugins/jack/jack-sink.c

@@ -31,6 +31,7 @@
 
 #include <jack/jack.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/utils/list.h>

spa/plugins/jack/jack-source.c

@@ -31,6 +31,7 @@
 
 #include <jack/jack.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/utils/list.h>

spa/plugins/v4l2/v4l2-device.c

@@ -29,6 +29,7 @@
 
 #include <linux/videodev2.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/utils/keys.h>

spa/plugins/v4l2/v4l2-source.c

@@ -29,6 +29,7 @@
 
 #include <linux/videodev2.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/utils/list.h>

spa/plugins/videoconvert/videoadapter.c

@@ -22,11 +22,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 
 #include <spa/node/node.h>
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
+#include <spa/utils/result.h>
 #include <spa/utils/names.h>
 #include <spa/buffer/alloc.h>
 #include <spa/pod/parser.h>

spa/plugins/vulkan/vulkan-compute-source.c

@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <sys/timerfd.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/utils/list.h>

spa/tests/test-node.c

@@ -23,6 +23,7 @@
  */
 
 #include <spa/utils/defs.h>
+#include <spa/node/node.h>
 #include <spa/node/io.h>
 #include <spa/node/command.h>
 #include <spa/node/event.h>

spa/tools/spa-inspect.c

@@ -28,8 +28,10 @@
 #include <unistd.h>
 #include <dlfcn.h>
 
+#include <spa/support/plugin.h>
 #include <spa/support/log-impl.h>
 #include <spa/support/loop.h>
+#include <spa/utils/result.h>
 #include <spa/node/node.h>
 #include <spa/node/utils.h>
 #include <spa/pod/parser.h>

src/daemon/main.c

@@ -25,6 +25,8 @@
 #include <signal.h>
 #include <getopt.h>
 
+#include <spa/utils/result.h>
+
 #include <pipewire/pipewire.h>
 #include <pipewire/core.h>
 #include <pipewire/module.h>

src/gst/gstpipewiresink.c

@@ -44,6 +44,9 @@
 #include <unistd.h>
 #include <sys/socket.h>
 
+#include <spa/pod/builder.h>
+#include <spa/utils/result.h>
+
 #include "gstpipewireformat.h"
 
 GST_DEBUG_CATEGORY_STATIC (pipewire_sink_debug);

src/gst/gstpipewiresrc.c

@@ -45,6 +45,8 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#include <spa/pod/builder.h>
+
 #include <gst/net/gstnetclientclock.h>
 #include <gst/allocators/gstfdmemory.h>
 #include <gst/allocators/gstdmabuf.h>

src/modules/module-access.c

@@ -32,6 +32,8 @@
 
 #include "config.h"
 
+#include <spa/utils/result.h>
+
 #include <pipewire/pipewire.h>
 
 static const struct spa_dict_item module_props[] = {

src/modules/module-client-device.c

@@ -29,6 +29,8 @@
 
 #include "config.h"
 
+#include <spa/utils/result.h>
+
 #include <pipewire/pipewire.h>
 
 #include "module-client-device/client-device.h"

src/modules/module-client-device/protocol-native.c

@@ -24,7 +24,9 @@
 
 #include <errno.h>
 
+#include <spa/pod/builder.h>
 #include <spa/pod/parser.h>
+#include <spa/utils/result.h>
 
 #include <pipewire/pipewire.h>
 

src/modules/module-client-node.c

@@ -29,6 +29,8 @@
 
 #include "config.h"
 
+#include <spa/utils/result.h>
+
 #include <pipewire/pipewire.h>
 
 #include "module-client-node/v0/client-node.h"

src/modules/module-client-node/protocol-native.c

@@ -24,7 +24,9 @@
 
 #include <errno.h>
 
+#include <spa/pod/builder.h>
 #include <spa/pod/parser.h>
+#include <spa/utils/result.h>
 
 #include <pipewire/pipewire.h>
 

src/modules/module-protocol-native/protocol-native.c

@@ -25,7 +25,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <spa/pod/builder.h>
 #include <spa/pod/parser.h>
+#include <spa/utils/result.h>
 
 #include <pipewire/pipewire.h>
 #include <extensions/protocol-native.h>

src/modules/module-protocol-native/test-connection.c

@@ -24,7 +24,9 @@
 
 #include <sys/socket.h>
 
+#include <spa/pod/builder.h>
 #include <spa/pod/parser.h>
+#include <spa/utils/result.h>
 
 #include <pipewire/pipewire.h>
 

src/modules/module-rtkit.c

@@ -38,6 +38,7 @@
 #include "config.h"
 
 #include <spa/support/dbus.h>
+#include <spa/utils/result.h>
 
 #include <pipewire/pipewire.h>
 

src/modules/spa/module-device-factory.c

@@ -29,6 +29,8 @@
 
 #include "config.h"
 
+#include <spa/utils/result.h>
+
 #include "pipewire/pipewire.h"
 
 #include "spa-device.h"

src/modules/spa/module-node-factory.c

@@ -27,6 +27,8 @@
 #include <errno.h>
 #include <dlfcn.h>
 
+#include <spa/utils/result.h>
+
 #include "config.h"
 
 #include "pipewire/pipewire.h"

src/pipewire/introspect.c

@@ -24,6 +24,8 @@
 
 #include <string.h>
 
+#include <spa/pod/builder.h>
+
 #include "pipewire/pipewire.h"
 
 #include "pipewire/remote.h"

src/pipewire/link.c

@@ -31,7 +31,6 @@
 #include <spa/pod/parser.h>
 #include <spa/pod/compare.h>
 #include <spa/param/param.h>
-#include <spa/buffer/alloc.h>
 
 #include "pipewire/keys.h"
 #include "pipewire/private.h"

src/pipewire/loop.c

@@ -26,6 +26,7 @@
 
 #include <spa/support/loop.h>
 #include <spa/utils/names.h>
+#include <spa/utils/result.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/loop.h>

src/pipewire/node.h

@@ -43,6 +43,7 @@ extern "C" {
  */
 struct pw_node;
 
+#include <spa/node/node.h>
 #include <spa/node/event.h>
 
 #include <pipewire/core.h>

src/pipewire/private.h

@@ -41,7 +41,9 @@ extern "C" {
 #include "pipewire/stream.h"
 #include "pipewire/log.h"
 
+#include <spa/support/plugin.h>
 #include <spa/pod/builder.h>
+#include <spa/utils/result.h>
 #include <spa/utils/type-info.h>
 
 #ifndef spa_debug

src/pipewire/thread-loop.c

@@ -26,6 +26,8 @@
 #include <errno.h>
 #include <sys/time.h>
 
+#include <spa/utils/result.h>
+
 #include "log.h"
 #include "thread-loop.h"