From ca471c04fc8616e6b887b4c968c47e4f5bfa638b Mon Sep 17 00:00:00 2001
From: Alexis Maiquez <almamu@almamu.com>
Date: Fri, 24 Mar 2023 02:51:17 +0100
Subject: [PATCH] Placed audio detectors in the right folder

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
---
 CMakeLists.txt                                            | 8 ++++----
 src/WallpaperEngine/Application/CWallpaperApplication.cpp | 4 ++--
 src/WallpaperEngine/Audio/Drivers/CAudioDriver.h          | 2 +-
 .../{ => Drivers}/Detectors/CAudioPlayingDetector.cpp     | 2 +-
 .../Audio/{ => Drivers}/Detectors/CAudioPlayingDetector.h | 2 +-
 .../Detectors/CPulseAudioPlayingDetector.cpp              | 2 +-
 .../{ => Drivers}/Detectors/CPulseAudioPlayingDetector.h  | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename src/WallpaperEngine/Audio/{ => Drivers}/Detectors/CAudioPlayingDetector.cpp (92%)
 rename src/WallpaperEngine/Audio/{ => Drivers}/Detectors/CAudioPlayingDetector.h (96%)
 rename src/WallpaperEngine/Audio/{ => Drivers}/Detectors/CPulseAudioPlayingDetector.cpp (98%)
 rename src/WallpaperEngine/Audio/{ => Drivers}/Detectors/CPulseAudioPlayingDetector.h (92%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 652c07b..ca8d244 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,10 +77,10 @@ add_executable(
     src/WallpaperEngine/Core/Core.h
     src/WallpaperEngine/Core/Core.cpp
 
-    src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.cpp
-    src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h
-    src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp
-    src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp
+    src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.cpp
+    src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h
+    src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.cpp
+    src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h
 
     src/WallpaperEngine/Audio/Drivers/CAudioDriver.cpp
     src/WallpaperEngine/Audio/Drivers/CAudioDriver.h
diff --git a/src/WallpaperEngine/Application/CWallpaperApplication.cpp b/src/WallpaperEngine/Application/CWallpaperApplication.cpp
index 0c88e54..3214ed3 100644
--- a/src/WallpaperEngine/Application/CWallpaperApplication.cpp
+++ b/src/WallpaperEngine/Application/CWallpaperApplication.cpp
@@ -11,7 +11,7 @@
 #include "WallpaperEngine/Render/Drivers/Output/CX11Output.h"
 #include "WallpaperEngine/Application/CApplicationState.h"
 #include "WallpaperEngine/Render/Drivers/Detectors/CX11FullScreenDetector.h"
-#include "WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.h"
+#include "WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h"
 
 #include <unistd.h>
 
@@ -275,7 +275,7 @@ namespace WallpaperEngine::Application
         // fullscreen detector is common for the different render modes
         WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector fullscreenDetector (videoDriver);
         // audio playing detector
-        WallpaperEngine::Audio::Detectors::CPulseAudioPlayingDetector audioDetector (this->m_context, fullscreenDetector);
+        WallpaperEngine::Audio::Drivers::Detectors::CPulseAudioPlayingDetector audioDetector (this->m_context, fullscreenDetector);
         // initialize sdl audio driver
         WallpaperEngine::Audio::Drivers::CSDLAudioDriver audioDriver (this->m_context, audioDetector);
         // initialize audio context
diff --git a/src/WallpaperEngine/Audio/Drivers/CAudioDriver.h b/src/WallpaperEngine/Audio/Drivers/CAudioDriver.h
index e860b9d..ccc1b1e 100644
--- a/src/WallpaperEngine/Audio/Drivers/CAudioDriver.h
+++ b/src/WallpaperEngine/Audio/Drivers/CAudioDriver.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h"
+#include "WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h"
 #include "WallpaperEngine/Application/CApplicationContext.h"
 #include "WallpaperEngine/Audio/CAudioStream.h"
 
diff --git a/src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.cpp b/src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.cpp
similarity index 92%
rename from src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.cpp
rename to src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.cpp
index ed2fae7..20a4820 100644
--- a/src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.cpp
+++ b/src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.cpp
@@ -1,6 +1,6 @@
 #include "CAudioPlayingDetector.h"
 
-namespace WallpaperEngine::Audio::Detectors
+namespace WallpaperEngine::Audio::Drivers::Detectors
 {
     CAudioPlayingDetector::CAudioPlayingDetector (
         Application::CApplicationContext& appContext,
diff --git a/src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h b/src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h
similarity index 96%
rename from src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h
rename to src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h
index cacf441..af195e2 100644
--- a/src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h
+++ b/src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h
@@ -15,7 +15,7 @@ namespace WallpaperEngine
         class CFullScreenDetector;
     }
 
-    namespace Audio::Detectors
+    namespace Audio::Drivers::Detectors
     {
         class CAudioPlayingDetector
         {
diff --git a/src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp b/src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.cpp
similarity index 98%
rename from src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp
rename to src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.cpp
index ec24d76..c194c7f 100644
--- a/src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp
+++ b/src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.cpp
@@ -1,7 +1,7 @@
 #include "CPulseAudioPlayingDetector.h"
 #include "WallpaperEngine/Logging/CLog.h"
 
-namespace WallpaperEngine::Audio::Detectors
+namespace WallpaperEngine::Audio::Drivers::Detectors
 {
     void sinkInputInfoCallback (pa_context* context, const pa_sink_input_info* info, int eol, void* userdata)
     {
diff --git a/src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.h b/src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h
similarity index 92%
rename from src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.h
rename to src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h
index f503ba1..eb7f27e 100644
--- a/src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.h
+++ b/src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h
@@ -5,7 +5,7 @@
 #include "CAudioPlayingDetector.h"
 #include <pulse/pulseaudio.h>
 
-namespace WallpaperEngine::Audio::Detectors
+namespace WallpaperEngine::Audio::Drivers::Detectors
 {
     class CPulseAudioPlayingDetector : public CAudioPlayingDetector
     {