move proxy implementations in their own file

Rearrange headers
2025-11-07 13:30:09 -05:00 · 2019-12-11 10:57:10 +01:00 · 2019-12-11 10:57:10 +01:00 · d70a47b7fe
commit d70a47b7fe
parent 49d736bbb7
74 changed files with 167 additions and 211 deletions
--- a/src/modules/module-access.c
+++ b/src/modules/module-access.c
@ -34,7 +34,7 @@

 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
--- a/src/modules/module-adapter.c
+++ b/src/modules/module-adapter.c
@ -32,7 +32,7 @@
 #include <spa/node/node.h>
 #include <spa/utils/hook.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include "pipewire/private.h"

 #include "modules/spa/spa-node.h"
--- a/src/modules/module-adapter/adapter.h
+++ b/src/modules/module-adapter/adapter.h
@ -25,7 +25,7 @@
 #ifndef PIPEWIRE_ADAPTER_H
 #define PIPEWIRE_ADAPTER_H

-#include <pipewire/node.h>
+#include <pipewire/impl.h>

 #ifdef __cplusplus
 extern "C" {
--- a/src/modules/module-client-device.c
+++ b/src/modules/module-client-device.c
@ -31,7 +31,7 @@

 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 #include "module-client-device/client-device.h"

--- a/src/modules/module-client-device/client-device.h
+++ b/src/modules/module-client-device/client-device.h
@ -25,7 +25,7 @@
 #ifndef PIPEWIRE_CLIENT_DEVICE_H
 #define PIPEWIRE_CLIENT_DEVICE_H

-#include <pipewire/device.h>
+#include <pipewire/impl.h>

 #ifdef __cplusplus
 extern "C" {
--- a/src/modules/module-client-device/protocol-native.c
+++ b/src/modules/module-client-device/protocol-native.c
@ -28,7 +28,7 @@
 #include <spa/pod/parser.h>
 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 #include <extensions/protocol-native.h>

--- a/src/modules/module-client-device/resource-device.c
+++ b/src/modules/module-client-device/resource-device.c
@ -35,7 +35,7 @@
 #include <spa/pod/parser.h>
 #include <spa/debug/types.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include "pipewire/private.h"

 struct impl {
--- a/src/modules/module-client-node.c
+++ b/src/modules/module-client-node.c
@ -31,7 +31,7 @@

 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 #include "module-client-node/v0/client-node.h"
 #include "module-client-node/client-node.h"
--- a/src/modules/module-client-node/client-node.h
+++ b/src/modules/module-client-node/client-node.h
@ -25,7 +25,7 @@
 #ifndef PIPEWIRE_CLIENT_NODE_H
 #define PIPEWIRE_CLIENT_NODE_H

-#include <pipewire/node.h>
+#include <pipewire/impl.h>
 #include <extensions/client-node.h>

 #ifdef __cplusplus
--- a/src/modules/module-client-node/protocol-native.c
+++ b/src/modules/module-client-node/protocol-native.c
@ -28,7 +28,7 @@
 #include <spa/pod/parser.h>
 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 #include <extensions/protocol-native.h>
 #include <extensions/client-node.h>
--- a/src/modules/module-client-node/v0/client-node.h
+++ b/src/modules/module-client-node/v0/client-node.h
@ -20,7 +20,7 @@
 #ifndef PIPEWIRE_CLIENT_NODE0_H
 #define PIPEWIRE_CLIENT_NODE0_H

-#include <pipewire/node.h>
+#include <pipewire/impl.h>

 #include "ext-client-node.h"

--- a/src/modules/module-client-node/v0/protocol-native.c
+++ b/src/modules/module-client-node/v0/protocol-native.c
@ -24,7 +24,7 @@
 #include "pipewire/pipewire.h"
 #include "pipewire/interfaces.h"
 #include "pipewire/protocol.h"
-#include "pipewire/client.h"
+#include "pipewire/impl-client.h"
 #include "pipewire/private.h"

 #include "extensions/protocol-native.h"
--- a/src/modules/module-client-node/v0/transport.c
+++ b/src/modules/module-client-node/v0/transport.c
@ -24,7 +24,7 @@
 #include <spa/utils/ringbuffer.h>
 #include <spa/node/io.h>

-#include <pipewire/log.h>
+#include <pipewire/impl.h>
 #include <pipewire/private.h>

 #include "ext-client-node.h"
--- a/src/modules/module-link-factory.c
+++ b/src/modules/module-link-factory.c
@ -29,7 +29,7 @@

 #include "config.h"

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include "pipewire/private.h"

 #define NAME "link-factory"
--- a/src/modules/module-metadata.c
+++ b/src/modules/module-metadata.c
@ -31,7 +31,7 @@

 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/metadata.h>

 #define NAME "metadata"
--- a/src/modules/module-metadata/resource-metadata.c
+++ b/src/modules/module-metadata/resource-metadata.c
@ -35,7 +35,7 @@
 #include <spa/pod/parser.h>
 #include <spa/debug/types.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include "pipewire/private.h"

 struct impl {
--- a/src/modules/module-protocol-native.c
+++ b/src/modules/module-protocol-native.c
@ -42,10 +42,9 @@
 #include <systemd/sd-daemon.h>
 #endif

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/protocol-native.h>

-#include "pipewire/map.h"
 #include "pipewire/private.h"

 #include "modules/module-protocol-native/connection.h"
--- a/src/modules/module-protocol-native/protocol-native.c
+++ b/src/modules/module-protocol-native/protocol-native.c
@ -29,7 +29,7 @@
 #include <spa/pod/parser.h>
 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/protocol-native.h>

 #include "connection.h"
--- a/src/modules/module-rtkit.c
+++ b/src/modules/module-rtkit.c
@ -42,7 +42,7 @@
 #include <spa/support/dbus.h>
 #include <spa/utils/result.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
--- a/src/modules/module-session-manager.c
+++ b/src/modules/module-session-manager.c
@ -25,7 +25,7 @@

 #include "config.h"

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>

 /* client-endpoint.c */
 int client_endpoint_factory_init(struct pw_module *module);
--- a/src/modules/module-session-manager/client-endpoint.c
+++ b/src/modules/module-session-manager/client-endpoint.c
@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <string.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/session-manager.h>

 #include "client-endpoint.h"
--- a/src/modules/module-session-manager/client-session.c
+++ b/src/modules/module-session-manager/client-session.c
@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <string.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/session-manager.h>

 #include "client-session.h"
--- a/src/modules/module-session-manager/endpoint-stream.c
+++ b/src/modules/module-session-manager/endpoint-stream.c
@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <string.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/session-manager.h>

 #include <spa/pod/filter.h>
--- a/src/modules/module-session-manager/endpoint.c
+++ b/src/modules/module-session-manager/endpoint.c
@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <string.h>

-#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
 #include <extensions/session-manager.h>

 #include <spa/pod/filter.h>
--- a/src/modules/spa/module-device-factory.c
+++ b/src/modules/spa/module-device-factory.c
@ -31,7 +31,7 @@

 #include <spa/utils/result.h>

-#include "pipewire/pipewire.h"
+#include "pipewire/impl.h"

 #include "spa-device.h"

--- a/src/modules/spa/module-device.c
+++ b/src/modules/spa/module-device.c
@ -29,11 +29,7 @@
 #include <getopt.h>
 #include <limits.h>

-#include <pipewire/context.h>
-#include <pipewire/log.h>
-#include <pipewire/module.h>
-#include <pipewire/utils.h>
-#include <pipewire/keys.h>
+#include <pipewire/impl.h>

 #include "spa-device.h"

--- a/src/modules/spa/module-node-factory.c
+++ b/src/modules/spa/module-node-factory.c
@ -31,7 +31,7 @@

 #include "config.h"

-#include "pipewire/pipewire.h"
+#include "pipewire/impl.h"

 #include "spa-node.h"

--- a/src/modules/spa/module-node.c
+++ b/src/modules/spa/module-node.c
@ -31,11 +31,7 @@
 #include <getopt.h>
 #include <limits.h>

-#include <pipewire/context.h>
-#include <pipewire/keys.h>
-#include <pipewire/log.h>
-#include <pipewire/module.h>
-#include <pipewire/utils.h>
+#include <pipewire/impl.h>

 #include "spa-node.h"

--- a/src/modules/spa/spa-device.c
+++ b/src/modules/spa/spa-device.c
@ -35,11 +35,7 @@
 #include <spa/debug/types.h>

 #include "spa-device.h"
-#include "pipewire/device.h"
-#include "pipewire/port.h"
-#include "pipewire/log.h"
 #include "pipewire/private.h"
-#include "pipewire/pipewire.h"

 struct impl {
 	struct pw_device *this;
--- a/src/modules/spa/spa-device.h
+++ b/src/modules/spa/spa-device.h
@ -27,8 +27,7 @@

 #include <spa/monitor/device.h>

-#include <pipewire/context.h>
-#include <pipewire/device.h>
+#include <pipewire/impl.h>

 #ifdef __cplusplus
 extern "C" {
--- a/src/modules/spa/spa-node.c
+++ b/src/modules/spa/spa-node.c
@ -37,11 +37,7 @@
 #include <spa/debug/types.h>

 #include "spa-node.h"
-#include "pipewire/node.h"
-#include "pipewire/port.h"
-#include "pipewire/log.h"
 #include "pipewire/private.h"
-#include "pipewire/pipewire.h"

 struct impl {
 	struct pw_node *this;
--- a/src/modules/spa/spa-node.h
+++ b/src/modules/spa/spa-node.h
@ -27,8 +27,7 @@

 #include <spa/node/node.h>

-#include <pipewire/context.h>
-#include <pipewire/node.h>
+#include <pipewire/impl.h>

 #ifdef __cplusplus
 extern "C" {