Placed audio detectors in the right folder

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2023-03-24 02:51:17 +01:00
parent 45761fb858
commit ca471c04fc
7 changed files with 11 additions and 11 deletions

View File

@ -77,10 +77,10 @@ add_executable(
src/WallpaperEngine/Core/Core.h src/WallpaperEngine/Core/Core.h
src/WallpaperEngine/Core/Core.cpp src/WallpaperEngine/Core/Core.cpp
src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.cpp src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.cpp
src/WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h src/WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h
src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.cpp
src/WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.cpp src/WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h
src/WallpaperEngine/Audio/Drivers/CAudioDriver.cpp src/WallpaperEngine/Audio/Drivers/CAudioDriver.cpp
src/WallpaperEngine/Audio/Drivers/CAudioDriver.h src/WallpaperEngine/Audio/Drivers/CAudioDriver.h

View File

@ -11,7 +11,7 @@
#include "WallpaperEngine/Render/Drivers/Output/CX11Output.h" #include "WallpaperEngine/Render/Drivers/Output/CX11Output.h"
#include "WallpaperEngine/Application/CApplicationState.h" #include "WallpaperEngine/Application/CApplicationState.h"
#include "WallpaperEngine/Render/Drivers/Detectors/CX11FullScreenDetector.h" #include "WallpaperEngine/Render/Drivers/Detectors/CX11FullScreenDetector.h"
#include "WallpaperEngine/Audio/Detectors/CPulseAudioPlayingDetector.h" #include "WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h"
#include <unistd.h> #include <unistd.h>
@ -275,7 +275,7 @@ namespace WallpaperEngine::Application
// fullscreen detector is common for the different render modes // fullscreen detector is common for the different render modes
WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector fullscreenDetector (videoDriver); WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector fullscreenDetector (videoDriver);
// audio playing detector // 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 // initialize sdl audio driver
WallpaperEngine::Audio::Drivers::CSDLAudioDriver audioDriver (this->m_context, audioDetector); WallpaperEngine::Audio::Drivers::CSDLAudioDriver audioDriver (this->m_context, audioDetector);
// initialize audio context // initialize audio context

View File

@ -2,7 +2,7 @@
#include <vector> #include <vector>
#include "WallpaperEngine/Audio/Detectors/CAudioPlayingDetector.h" #include "WallpaperEngine/Audio/Drivers/Detectors/CAudioPlayingDetector.h"
#include "WallpaperEngine/Application/CApplicationContext.h" #include "WallpaperEngine/Application/CApplicationContext.h"
#include "WallpaperEngine/Audio/CAudioStream.h" #include "WallpaperEngine/Audio/CAudioStream.h"

View File

@ -1,6 +1,6 @@
#include "CAudioPlayingDetector.h" #include "CAudioPlayingDetector.h"
namespace WallpaperEngine::Audio::Detectors namespace WallpaperEngine::Audio::Drivers::Detectors
{ {
CAudioPlayingDetector::CAudioPlayingDetector ( CAudioPlayingDetector::CAudioPlayingDetector (
Application::CApplicationContext& appContext, Application::CApplicationContext& appContext,

View File

@ -15,7 +15,7 @@ namespace WallpaperEngine
class CFullScreenDetector; class CFullScreenDetector;
} }
namespace Audio::Detectors namespace Audio::Drivers::Detectors
{ {
class CAudioPlayingDetector class CAudioPlayingDetector
{ {

View File

@ -1,7 +1,7 @@
#include "CPulseAudioPlayingDetector.h" #include "CPulseAudioPlayingDetector.h"
#include "WallpaperEngine/Logging/CLog.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) void sinkInputInfoCallback (pa_context* context, const pa_sink_input_info* info, int eol, void* userdata)
{ {

View File

@ -5,7 +5,7 @@
#include "CAudioPlayingDetector.h" #include "CAudioPlayingDetector.h"
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
namespace WallpaperEngine::Audio::Detectors namespace WallpaperEngine::Audio::Drivers::Detectors
{ {
class CPulseAudioPlayingDetector : public CAudioPlayingDetector class CPulseAudioPlayingDetector : public CAudioPlayingDetector
{ {