From 9ffec214b82a9f297e7a39d51e5bbadfc4da74b8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 25 Oct 2019 15:01:02 +0200 Subject: [PATCH] fix includes --- pipewire-alsa | 2 +- pipewire-pulseaudio | 2 +- spa/examples/example-control.c | 2 ++ spa/examples/local-v4l2.c | 2 ++ spa/include/spa/monitor/device.h | 3 +-- spa/include/spa/monitor/utils.h | 1 + spa/include/spa/node/event.h | 2 -- spa/include/spa/node/node.h | 11 ++++------- spa/include/spa/param/type-info.h | 1 - spa/include/spa/support/loop.h | 1 - spa/include/spa/support/system.h | 1 - spa/include/spa/utils/defs.h | 8 -------- spa/include/spa/utils/result.h | 8 ++++++++ spa/plugins/alsa/alsa-pcm.h | 1 + spa/plugins/alsa/alsa-seq.c | 1 + spa/plugins/alsa/alsa-seq.h | 1 + spa/plugins/audioconvert/audioadapter.c | 2 ++ spa/plugins/audioconvert/audioconvert.c | 2 ++ spa/plugins/audioconvert/channelmix.c | 1 + spa/plugins/audioconvert/fmtconvert.c | 1 + spa/plugins/audioconvert/merger.c | 2 ++ spa/plugins/audioconvert/resample.c | 1 + spa/plugins/audioconvert/splitter.c | 1 + spa/plugins/audioconvert/test-source.c | 1 + spa/plugins/audiomixer/audiomixer.c | 1 + spa/plugins/audiomixer/mixer-dsp.c | 1 + spa/plugins/bluez5/a2dp-sink.c | 2 ++ spa/plugins/bluez5/a2dp-source.c | 2 ++ spa/plugins/bluez5/sco-sink.c | 1 + spa/plugins/bluez5/sco-source.c | 1 + spa/plugins/control/mixer.c | 1 + spa/plugins/jack/jack-device.c | 1 + spa/plugins/jack/jack-sink.c | 1 + spa/plugins/jack/jack-source.c | 1 + spa/plugins/v4l2/v4l2-device.c | 1 + spa/plugins/v4l2/v4l2-source.c | 1 + spa/plugins/videoconvert/videoadapter.c | 2 ++ spa/plugins/vulkan/vulkan-compute-source.c | 1 + spa/tests/test-node.c | 1 + spa/tools/spa-inspect.c | 2 ++ src/daemon/main.c | 2 ++ src/gst/gstpipewiresink.c | 3 +++ src/gst/gstpipewiresrc.c | 2 ++ src/modules/module-access.c | 2 ++ src/modules/module-client-device.c | 2 ++ src/modules/module-client-device/protocol-native.c | 2 ++ src/modules/module-client-node.c | 2 ++ src/modules/module-client-node/protocol-native.c | 2 ++ src/modules/module-protocol-native/protocol-native.c | 2 ++ src/modules/module-protocol-native/test-connection.c | 2 ++ src/modules/module-rtkit.c | 1 + src/modules/spa/module-device-factory.c | 2 ++ src/modules/spa/module-node-factory.c | 2 ++ src/pipewire/introspect.c | 2 ++ src/pipewire/link.c | 1 - src/pipewire/loop.c | 1 + src/pipewire/node.h | 1 + src/pipewire/private.h | 2 ++ src/pipewire/thread-loop.c | 2 ++ 59 files changed, 88 insertions(+), 25 deletions(-) diff --git a/pipewire-alsa b/pipewire-alsa index dddaaf4db..a52d6bc2d 160000 --- a/pipewire-alsa +++ b/pipewire-alsa @@ -1 +1 @@ -Subproject commit dddaaf4db427cb5b9bc5cc273bff00bfdb75d7c7 +Subproject commit a52d6bc2d3989cfc2bf75639e9a81941c0b685ed diff --git a/pipewire-pulseaudio b/pipewire-pulseaudio index 694ae6dd8..772ec76cd 160000 --- a/pipewire-pulseaudio +++ b/pipewire-pulseaudio @@ -1 +1 @@ -Subproject commit 694ae6dd84dc4f98add11474607d8e211bd4ae4a +Subproject commit 772ec76cd90b4ac089e6903d4a078088cd02e14d diff --git a/spa/examples/example-control.c b/spa/examples/example-control.c index f502cdfff..ec7dd4bdf 100644 --- a/spa/examples/example-control.c +++ b/spa/examples/example-control.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #include #include #include +#include #define M_PI_M2 ( M_PI + M_PI ) diff --git a/spa/examples/local-v4l2.c b/spa/examples/local-v4l2.c index fd7cec9ce..5168ce579 100644 --- a/spa/examples/local-v4l2.c +++ b/spa/examples/local-v4l2.c @@ -34,7 +34,9 @@ #include +#include #include +#include #include #include #include diff --git a/spa/include/spa/monitor/device.h b/spa/include/spa/monitor/device.h index ef41c6e23..e2741d157 100644 --- a/spa/include/spa/monitor/device.h +++ b/spa/include/spa/monitor/device.h @@ -30,9 +30,8 @@ extern "C" { #endif #include +#include #include -#include -#include #include /** diff --git a/spa/include/spa/monitor/utils.h b/spa/include/spa/monitor/utils.h index 4c68a207e..87e3c7db7 100644 --- a/spa/include/spa/monitor/utils.h +++ b/spa/include/spa/monitor/utils.h @@ -29,6 +29,7 @@ extern "C" { #endif +#include #include struct spa_result_device_params_data { diff --git a/spa/include/spa/node/event.h b/spa/include/spa/node/event.h index ff3513cf9..ffc25e335 100644 --- a/spa/include/spa/node/event.h +++ b/spa/include/spa/node/event.h @@ -29,9 +29,7 @@ extern "C" { #endif -#include #include -#include /* object id of SPA_TYPE_EVENT_Node */ enum spa_node_event { diff --git a/spa/include/spa/node/node.h b/spa/include/spa/node/node.h index 9cba84cc5..4bb9ca620 100644 --- a/spa/include/spa/node/node.h +++ b/spa/include/spa/node/node.h @@ -30,9 +30,12 @@ extern "C" { #endif #include -#include #include #include +#include +#include +#include + /** * 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 - -#include -#include -#include - /** * Node information structure * diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h index 0b12f9ac6..6065e6c27 100644 --- a/spa/include/spa/param/type-info.h +++ b/spa/include/spa/param/type-info.h @@ -32,7 +32,6 @@ extern "C" { #include #include #include -#include #include /* base for parameter object enumerations */ diff --git a/spa/include/spa/support/loop.h b/spa/include/spa/support/loop.h index f892d0bb0..3e040df49 100644 --- a/spa/include/spa/support/loop.h +++ b/spa/include/spa/support/loop.h @@ -31,7 +31,6 @@ extern "C" { #include #include -#include #include #define SPA_VERSION_LOOP 0 diff --git a/spa/include/spa/support/system.h b/spa/include/spa/support/system.h index dae9062a6..0e9dcfa15 100644 --- a/spa/include/spa/support/system.h +++ b/spa/include/spa/support/system.h @@ -33,7 +33,6 @@ extern "C" { #include #include -#include /** * a collection of core system functions diff --git a/spa/include/spa/utils/defs.h b/spa/include/spa/utils/defs.h index f445ffdf3..8992bcd5d 100644 --- a/spa/include/spa/utils/defs.h +++ b/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) \ ({ \ diff --git a/spa/include/spa/utils/result.h b/spa/include/spa/utils/result.h index 6ec612a65..1b09570ec 100644 --- a/spa/include/spa/utils/result.h +++ b/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 diff --git a/spa/plugins/alsa/alsa-pcm.h b/spa/plugins/alsa/alsa-pcm.h index 38f546062..b7a2dd294 100644 --- a/spa/plugins/alsa/alsa-pcm.h +++ b/spa/plugins/alsa/alsa-pcm.h @@ -34,6 +34,7 @@ extern "C" { #include +#include #include #include #include diff --git a/spa/plugins/alsa/alsa-seq.c b/spa/plugins/alsa/alsa-seq.c index a598c455d..a1f356969 100644 --- a/spa/plugins/alsa/alsa-seq.c +++ b/spa/plugins/alsa/alsa-seq.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/alsa/alsa-seq.h b/spa/plugins/alsa/alsa-seq.h index 66bb16be9..903b15b47 100644 --- a/spa/plugins/alsa/alsa-seq.h +++ b/spa/plugins/alsa/alsa-seq.h @@ -34,6 +34,7 @@ extern "C" { #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/audioadapter.c b/spa/plugins/audioconvert/audioadapter.c index 5dddaf697..96f8e727c 100644 --- a/spa/plugins/audioconvert/audioadapter.c +++ b/spa/plugins/audioconvert/audioadapter.c @@ -22,6 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include @@ -29,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c index 4dd08d4ba..827aea69c 100644 --- a/spa/plugins/audioconvert/audioconvert.c +++ b/spa/plugins/audioconvert/audioconvert.c @@ -26,8 +26,10 @@ #include #include +#include #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index 5b7daa887..df66309de 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/fmtconvert.c b/spa/plugins/audioconvert/fmtconvert.c index a57307e30..7cb9b049e 100644 --- a/spa/plugins/audioconvert/fmtconvert.c +++ b/spa/plugins/audioconvert/fmtconvert.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/merger.c b/spa/plugins/audioconvert/merger.c index a13222e70..eeec4a73d 100644 --- a/spa/plugins/audioconvert/merger.c +++ b/spa/plugins/audioconvert/merger.c @@ -27,8 +27,10 @@ #include #include +#include #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/resample.c b/spa/plugins/audioconvert/resample.c index 9ffecb073..7ba90626b 100644 --- a/spa/plugins/audioconvert/resample.c +++ b/spa/plugins/audioconvert/resample.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/splitter.c b/spa/plugins/audioconvert/splitter.c index a7683a0bc..acd3ef940 100644 --- a/spa/plugins/audioconvert/splitter.c +++ b/spa/plugins/audioconvert/splitter.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/audioconvert/test-source.c b/spa/plugins/audioconvert/test-source.c index daa98619d..5b7e9cb47 100644 --- a/spa/plugins/audioconvert/test-source.c +++ b/spa/plugins/audioconvert/test-source.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/audiomixer/audiomixer.c b/spa/plugins/audiomixer/audiomixer.c index 15743dad1..601c59715 100644 --- a/spa/plugins/audiomixer/audiomixer.c +++ b/spa/plugins/audiomixer/audiomixer.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/audiomixer/mixer-dsp.c b/spa/plugins/audiomixer/mixer-dsp.c index 89baf8ed4..f73eabdc4 100644 --- a/spa/plugins/audiomixer/mixer-dsp.c +++ b/spa/plugins/audiomixer/mixer-dsp.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/bluez5/a2dp-sink.c b/spa/plugins/bluez5/a2dp-sink.c index 57017b807..4436f4b36 100644 --- a/spa/plugins/bluez5/a2dp-sink.c +++ b/spa/plugins/bluez5/a2dp-sink.c @@ -28,12 +28,14 @@ #include #include +#include #include #include #include #include #include #include +#include #include #include diff --git a/spa/plugins/bluez5/a2dp-source.c b/spa/plugins/bluez5/a2dp-source.c index 7056aaade..2d09761ef 100644 --- a/spa/plugins/bluez5/a2dp-source.c +++ b/spa/plugins/bluez5/a2dp-source.c @@ -31,12 +31,14 @@ #include #include +#include #include #include #include #include #include #include +#include #include #include diff --git a/spa/plugins/bluez5/sco-sink.c b/spa/plugins/bluez5/sco-sink.c index c02c00b0d..f9dcee851 100644 --- a/spa/plugins/bluez5/sco-sink.c +++ b/spa/plugins/bluez5/sco-sink.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/bluez5/sco-source.c b/spa/plugins/bluez5/sco-source.c index 7fdb0b05b..68846e956 100644 --- a/spa/plugins/bluez5/sco-source.c +++ b/spa/plugins/bluez5/sco-source.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/control/mixer.c b/spa/plugins/control/mixer.c index 66f2ff8fd..2a473efee 100644 --- a/spa/plugins/control/mixer.c +++ b/spa/plugins/control/mixer.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/spa/plugins/jack/jack-device.c b/spa/plugins/jack/jack-device.c index 73382069a..27959cc88 100644 --- a/spa/plugins/jack/jack-device.c +++ b/spa/plugins/jack/jack-device.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/spa/plugins/jack/jack-sink.c b/spa/plugins/jack/jack-sink.c index 794fffbb9..8a2f7989b 100644 --- a/spa/plugins/jack/jack-sink.c +++ b/spa/plugins/jack/jack-sink.c @@ -31,6 +31,7 @@ #include +#include #include #include #include diff --git a/spa/plugins/jack/jack-source.c b/spa/plugins/jack/jack-source.c index 77fd135c5..3981ef22d 100644 --- a/spa/plugins/jack/jack-source.c +++ b/spa/plugins/jack/jack-source.c @@ -31,6 +31,7 @@ #include +#include #include #include #include diff --git a/spa/plugins/v4l2/v4l2-device.c b/spa/plugins/v4l2/v4l2-device.c index a561195ef..2abb5260a 100644 --- a/spa/plugins/v4l2/v4l2-device.c +++ b/spa/plugins/v4l2/v4l2-device.c @@ -29,6 +29,7 @@ #include +#include #include #include #include diff --git a/spa/plugins/v4l2/v4l2-source.c b/spa/plugins/v4l2/v4l2-source.c index 8b263a346..65a680bb2 100644 --- a/spa/plugins/v4l2/v4l2-source.c +++ b/spa/plugins/v4l2/v4l2-source.c @@ -29,6 +29,7 @@ #include +#include #include #include #include diff --git a/spa/plugins/videoconvert/videoadapter.c b/spa/plugins/videoconvert/videoadapter.c index 7c893f35b..2c8918534 100644 --- a/spa/plugins/videoconvert/videoadapter.c +++ b/spa/plugins/videoconvert/videoadapter.c @@ -22,11 +22,13 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include #include #include +#include #include #include #include diff --git a/spa/plugins/vulkan/vulkan-compute-source.c b/spa/plugins/vulkan/vulkan-compute-source.c index 3e9e6e1f3..ee7a2b8ed 100644 --- a/spa/plugins/vulkan/vulkan-compute-source.c +++ b/spa/plugins/vulkan/vulkan-compute-source.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/spa/tests/test-node.c b/spa/tests/test-node.c index 63bf6f7c7..1f329e433 100644 --- a/spa/tests/test-node.c +++ b/spa/tests/test-node.c @@ -23,6 +23,7 @@ */ #include +#include #include #include #include diff --git a/spa/tools/spa-inspect.c b/spa/tools/spa-inspect.c index 1f71f116b..d02cd8b1a 100644 --- a/spa/tools/spa-inspect.c +++ b/spa/tools/spa-inspect.c @@ -28,8 +28,10 @@ #include #include +#include #include #include +#include #include #include #include diff --git a/src/daemon/main.c b/src/daemon/main.c index 3217f3c64..09d9e510a 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -25,6 +25,8 @@ #include #include +#include + #include #include #include diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c index 562d55c52..d9ebd7225 100644 --- a/src/gst/gstpipewiresink.c +++ b/src/gst/gstpipewiresink.c @@ -44,6 +44,9 @@ #include #include +#include +#include + #include "gstpipewireformat.h" GST_DEBUG_CATEGORY_STATIC (pipewire_sink_debug); diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c index 1f372a810..683a75c30 100644 --- a/src/gst/gstpipewiresrc.c +++ b/src/gst/gstpipewiresrc.c @@ -45,6 +45,8 @@ #include #include +#include + #include #include #include diff --git a/src/modules/module-access.c b/src/modules/module-access.c index 347ec34d9..09dafa433 100644 --- a/src/modules/module-access.c +++ b/src/modules/module-access.c @@ -32,6 +32,8 @@ #include "config.h" +#include + #include static const struct spa_dict_item module_props[] = { diff --git a/src/modules/module-client-device.c b/src/modules/module-client-device.c index 052484eb3..4a7fbe575 100644 --- a/src/modules/module-client-device.c +++ b/src/modules/module-client-device.c @@ -29,6 +29,8 @@ #include "config.h" +#include + #include #include "module-client-device/client-device.h" diff --git a/src/modules/module-client-device/protocol-native.c b/src/modules/module-client-device/protocol-native.c index a5e71ed0d..55e6ee4c6 100644 --- a/src/modules/module-client-device/protocol-native.c +++ b/src/modules/module-client-device/protocol-native.c @@ -24,7 +24,9 @@ #include +#include #include +#include #include diff --git a/src/modules/module-client-node.c b/src/modules/module-client-node.c index 0f70aca8f..6e42674d9 100644 --- a/src/modules/module-client-node.c +++ b/src/modules/module-client-node.c @@ -29,6 +29,8 @@ #include "config.h" +#include + #include #include "module-client-node/v0/client-node.h" diff --git a/src/modules/module-client-node/protocol-native.c b/src/modules/module-client-node/protocol-native.c index c2b4b109a..0d821d891 100644 --- a/src/modules/module-client-node/protocol-native.c +++ b/src/modules/module-client-node/protocol-native.c @@ -24,7 +24,9 @@ #include +#include #include +#include #include diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index 8c55bf563..db47dc78d 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -25,7 +25,9 @@ #include #include +#include #include +#include #include #include diff --git a/src/modules/module-protocol-native/test-connection.c b/src/modules/module-protocol-native/test-connection.c index c6b671abf..7e3158e3d 100644 --- a/src/modules/module-protocol-native/test-connection.c +++ b/src/modules/module-protocol-native/test-connection.c @@ -24,7 +24,9 @@ #include +#include #include +#include #include diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c index 0375db145..74545e46b 100644 --- a/src/modules/module-rtkit.c +++ b/src/modules/module-rtkit.c @@ -38,6 +38,7 @@ #include "config.h" #include +#include #include diff --git a/src/modules/spa/module-device-factory.c b/src/modules/spa/module-device-factory.c index 5ec13c772..2784283c5 100644 --- a/src/modules/spa/module-device-factory.c +++ b/src/modules/spa/module-device-factory.c @@ -29,6 +29,8 @@ #include "config.h" +#include + #include "pipewire/pipewire.h" #include "spa-device.h" diff --git a/src/modules/spa/module-node-factory.c b/src/modules/spa/module-node-factory.c index 1db58c330..d24d5813a 100644 --- a/src/modules/spa/module-node-factory.c +++ b/src/modules/spa/module-node-factory.c @@ -27,6 +27,8 @@ #include #include +#include + #include "config.h" #include "pipewire/pipewire.h" diff --git a/src/pipewire/introspect.c b/src/pipewire/introspect.c index aa246a2f5..d8f6442b2 100644 --- a/src/pipewire/introspect.c +++ b/src/pipewire/introspect.c @@ -24,6 +24,8 @@ #include +#include + #include "pipewire/pipewire.h" #include "pipewire/remote.h" diff --git a/src/pipewire/link.c b/src/pipewire/link.c index f079b5d4f..d16e1c91f 100644 --- a/src/pipewire/link.c +++ b/src/pipewire/link.c @@ -31,7 +31,6 @@ #include #include #include -#include #include "pipewire/keys.h" #include "pipewire/private.h" diff --git a/src/pipewire/loop.c b/src/pipewire/loop.c index 27131ef07..af6ccf4e0 100644 --- a/src/pipewire/loop.c +++ b/src/pipewire/loop.c @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/src/pipewire/node.h b/src/pipewire/node.h index 1d6c2ecab..d03855ae6 100644 --- a/src/pipewire/node.h +++ b/src/pipewire/node.h @@ -43,6 +43,7 @@ extern "C" { */ struct pw_node; +#include #include #include diff --git a/src/pipewire/private.h b/src/pipewire/private.h index 565d0a887..90b398284 100644 --- a/src/pipewire/private.h +++ b/src/pipewire/private.h @@ -41,7 +41,9 @@ extern "C" { #include "pipewire/stream.h" #include "pipewire/log.h" +#include #include +#include #include #ifndef spa_debug diff --git a/src/pipewire/thread-loop.c b/src/pipewire/thread-loop.c index c04b7bc95..ede95efa4 100644 --- a/src/pipewire/thread-loop.c +++ b/src/pipewire/thread-loop.c @@ -26,6 +26,8 @@ #include #include +#include + #include "log.h" #include "thread-loop.h"