From 91472c51e9bcee20bbb5b75d1357b4c57edec171 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Sun, 15 Nov 2020 20:01:51 +0200
Subject: [PATCH] lib: move WpImplEndpoint* header parts to
private/impl-endpoint.h
---
lib/wp/endpoint-link.c | 2 +-
lib/wp/endpoint-stream.c | 2 +-
lib/wp/endpoint.c | 2 +-
lib/wp/private.h | 29 +--------------------
lib/wp/private/impl-endpoint.h | 46 ++++++++++++++++++++++++++++++++++
lib/wp/session-item.c | 3 ++-
lib/wp/session.c | 2 +-
7 files changed, 53 insertions(+), 33 deletions(-)
create mode 100644 lib/wp/private/impl-endpoint.h
diff --git a/lib/wp/endpoint-link.c b/lib/wp/endpoint-link.c
index 5c872e74..209c6eb3 100644
--- a/lib/wp/endpoint-link.c
+++ b/lib/wp/endpoint-link.c
@@ -16,7 +16,7 @@
#include "endpoint-link.h"
#include "error.h"
#include "wpenums.h"
-#include "private.h"
+#include "private/impl-endpoint.h"
#include "private/pipewire-object-mixin.h"
#include <pipewire/extensions/session-manager.h>
diff --git a/lib/wp/endpoint-stream.c b/lib/wp/endpoint-stream.c
index 34a855f3..269557f5 100644
--- a/lib/wp/endpoint-stream.c
+++ b/lib/wp/endpoint-stream.c
@@ -16,7 +16,7 @@
#include "endpoint-stream.h"
#include "node.h"
#include "error.h"
-#include "private.h"
+#include "private/impl-endpoint.h"
#include "private/pipewire-object-mixin.h"
#include <pipewire/extensions/session-manager.h>
diff --git a/lib/wp/endpoint.c b/lib/wp/endpoint.c
index 6a495f48..1e18a5ce 100644
--- a/lib/wp/endpoint.c
+++ b/lib/wp/endpoint.c
@@ -19,7 +19,7 @@
#include "error.h"
#include "wpenums.h"
#include "si-factory.h"
-#include "private.h"
+#include "private/impl-endpoint.h"
#include "private/pipewire-object-mixin.h"
#include <pipewire/extensions/session-manager.h>
diff --git a/lib/wp/private.h b/lib/wp/private.h
index 2734d099..33447682 100644
--- a/lib/wp/private.h
+++ b/lib/wp/private.h
@@ -13,9 +13,7 @@
#include "object-manager.h"
#include "props.h"
#include "proxy.h"
-#include "endpoint.h"
-#include "endpoint-stream.h"
-#include "si-interfaces.h"
+#include "session-item.h"
#include "iterator.h"
#include "spa-type.h"
#include "private/registry.h"
@@ -69,31 +67,6 @@ const struct spa_pod *wp_spa_pod_get_spa_pod (const WpSpaPod *self);
void wp_session_item_set_parent (WpSessionItem *self, WpSessionItem *parent);
-/* impl endpoint */
-
-#define WP_TYPE_IMPL_ENDPOINT (wp_impl_endpoint_get_type ())
-G_DECLARE_FINAL_TYPE (WpImplEndpoint, wp_impl_endpoint,
- WP, IMPL_ENDPOINT, WpEndpoint)
-
-WpImplEndpoint * wp_impl_endpoint_new (WpCore * core, WpSiEndpoint * item);
-
-/* impl endpoint stream */
-
-#define WP_TYPE_IMPL_ENDPOINT_STREAM (wp_impl_endpoint_stream_get_type ())
-G_DECLARE_FINAL_TYPE (WpImplEndpointStream, wp_impl_endpoint_stream,
- WP, IMPL_ENDPOINT_STREAM, WpEndpointStream)
-
-WpImplEndpointStream * wp_impl_endpoint_stream_new (WpCore * core,
- WpSiStream * item);
-
-/* impl endpoint link */
-
-#define WP_TYPE_IMPL_ENDPOINT_LINK (wp_impl_endpoint_link_get_type ())
-G_DECLARE_FINAL_TYPE (WpImplEndpointLink, wp_impl_endpoint_link,
- WP, IMPL_ENDPOINT_LINK, WpEndpointLink)
-
-WpImplEndpointLink * wp_impl_endpoint_link_new (WpCore * core, WpSiLink * item);
-
G_END_DECLS
#endif
diff --git a/lib/wp/private/impl-endpoint.h b/lib/wp/private/impl-endpoint.h
new file mode 100644
index 00000000..a22c51e4
--- /dev/null
+++ b/lib/wp/private/impl-endpoint.h
@@ -0,0 +1,46 @@
+/* WirePlumber
+ *
+ * Copyright © 2019 Collabora Ltd.
+ * @author George Kiagiadakis <george.kiagiadakis@collabora.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef __WIREPLUMBER_PRIVATE_IMPL_ENDPOINT_H__
+#define __WIREPLUMBER_PRIVATE_IMPL_ENDPOINT_H__
+
+#include "endpoint.h"
+#include "endpoint-stream.h"
+#include "endpoint-link.h"
+#include "si-interfaces.h"
+
+G_BEGIN_DECLS
+
+/* impl endpoint */
+
+#define WP_TYPE_IMPL_ENDPOINT (wp_impl_endpoint_get_type ())
+G_DECLARE_FINAL_TYPE (WpImplEndpoint, wp_impl_endpoint,
+ WP, IMPL_ENDPOINT, WpEndpoint)
+
+WpImplEndpoint * wp_impl_endpoint_new (WpCore * core, WpSiEndpoint * item);
+
+/* impl endpoint stream */
+
+#define WP_TYPE_IMPL_ENDPOINT_STREAM (wp_impl_endpoint_stream_get_type ())
+G_DECLARE_FINAL_TYPE (WpImplEndpointStream, wp_impl_endpoint_stream,
+ WP, IMPL_ENDPOINT_STREAM, WpEndpointStream)
+
+WpImplEndpointStream * wp_impl_endpoint_stream_new (WpCore * core,
+ WpSiStream * item);
+
+/* impl endpoint link */
+
+#define WP_TYPE_IMPL_ENDPOINT_LINK (wp_impl_endpoint_link_get_type ())
+G_DECLARE_FINAL_TYPE (WpImplEndpointLink, wp_impl_endpoint_link,
+ WP, IMPL_ENDPOINT_LINK, WpEndpointLink)
+
+WpImplEndpointLink * wp_impl_endpoint_link_new (WpCore * core, WpSiLink * item);
+
+G_END_DECLS
+
+#endif
diff --git a/lib/wp/session-item.c b/lib/wp/session-item.c
index ca215442..20d819cd 100644
--- a/lib/wp/session-item.c
+++ b/lib/wp/session-item.c
@@ -15,9 +15,10 @@
#include "session-item.h"
#include "debug.h"
-#include "private.h"
#include "error.h"
#include "wpenums.h"
+#include "private.h"
+#include "private/impl-endpoint.h"
struct _WpSiTransition
{
diff --git a/lib/wp/session.c b/lib/wp/session.c
index a7dda9aa..b4f91433 100644
--- a/lib/wp/session.c
+++ b/lib/wp/session.c
@@ -16,7 +16,7 @@
#include "session.h"
#include "error.h"
#include "wpenums.h"
-#include "private.h"
+#include "private/impl-endpoint.h"
#include "private/pipewire-object-mixin.h"
#include <pipewire/extensions/session-manager.h>
--
GitLab