Merge pull request #22809 from lrusak/pipewire-includes

9 files changed, 22 insertions, 21 deletions

diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/Pipewire.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/Pipewire.cpp
index deeaa02ef9..dafa9099ee 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/Pipewire.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/Pipewire.cpp
@@ -8,10 +8,10 @@
 
 #include "Pipewire.h"
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireContext.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireCore.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireThreadLoop.h"
+#include "PipewireContext.h"
+#include "PipewireCore.h"
+#include "PipewireRegistry.h"
+#include "PipewireThreadLoop.h"
 #include "utils/log.h"
 
 #include <pipewire/pipewire.h>
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireContext.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireContext.cpp
index 09aff46aec..432a6c9597 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireContext.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireContext.cpp
@@ -8,7 +8,7 @@
 
 #include "PipewireContext.h"
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireThreadLoop.h"
+#include "PipewireThreadLoop.h"
 #include "utils/log.h"
 
 #include <stdexcept>
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireCore.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireCore.cpp
index 080b700466..c4af02ee65 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireCore.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireCore.cpp
@@ -8,8 +8,8 @@
 
 #include "PipewireCore.h"
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireContext.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireThreadLoop.h"
+#include "PipewireContext.h"
+#include "PipewireThreadLoop.h"
 #include "utils/log.h"
 
 #include <stdexcept>
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp
index aa2510ecfb..bbb4cd9c31 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp
@@ -8,10 +8,10 @@
 
 #include "PipewireNode.h"
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireContext.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireCore.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireThreadLoop.h"
+#include "PipewireContext.h"
+#include "PipewireCore.h"
+#include "PipewireRegistry.h"
+#include "PipewireThreadLoop.h"
 #include "utils/StringUtils.h"
 #include "utils/log.h"
 
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.h b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.h
index 4d9a155d07..106c7c7827 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.h
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireProxy.h"
+#include "PipewireProxy.h"
 
 #include <memory>
 #include <set>
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireProxy.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireProxy.cpp
index a0185c891d..69a5397fea 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireProxy.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireProxy.cpp
@@ -8,9 +8,9 @@
 
 #include "PipewireProxy.h"
 
+#include "PipewireRegistry.h"
 #include "ServiceBroker.h"
 #include "cores/AudioEngine/Interfaces/AE.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h"
 #include "utils/log.h"
 
 #include <stdexcept>
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp
index e73a0aeda9..244d23419d 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp
@@ -8,8 +8,8 @@
 
 #include "PipewireRegistry.h"
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireCore.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireNode.h"
+#include "PipewireCore.h"
+#include "PipewireNode.h"
 #include "utils/log.h"
 
 #include <stdexcept>
@@ -34,6 +34,8 @@ CPipewireRegistry::CPipewireRegistry(CPipewireCore& core)
   pw_registry_add_listener(m_registry.get(), &m_registryListener, &m_registryEvents, this);
 }
 
+CPipewireRegistry::~CPipewireRegistry() = default;
+
 void CPipewireRegistry::OnGlobalAdded(void* userdata,
                                       uint32_t id,
                                       uint32_t permissions,
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h
index f1bad367b9..645b13fad7 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireProxy.h"
-
 #include <map>
 #include <memory>
 #include <string>
@@ -23,13 +21,14 @@ namespace PIPEWIRE
 {
 
 class CPipewireCore;
+class CPipewireProxy;
 
 class CPipewireRegistry
 {
 public:
   explicit CPipewireRegistry(CPipewireCore& core);
   CPipewireRegistry() = delete;
-  ~CPipewireRegistry() = default;
+  ~CPipewireRegistry();
 
   pw_registry* Get() const { return m_registry.get(); }
 
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireStream.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireStream.cpp
index b7cce66d2f..63e4a320d4 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireStream.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireStream.cpp
@@ -8,9 +8,9 @@
 
 #include "PipewireStream.h"
 
-#include "cores/AudioEngine/Sinks/pipewire/PipewireContext.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireCore.h"
-#include "cores/AudioEngine/Sinks/pipewire/PipewireThreadLoop.h"
+#include "PipewireContext.h"
+#include "PipewireCore.h"
+#include "PipewireThreadLoop.h"
 #include "utils/log.h"
 
 #include <stdexcept>