mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-22 03:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audio: don’t build ALSA, PulseAudio or FAudio backends when disabled

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2019-10-27 23:49:31 +01:00 committed by Nekotekina
parent 63bbf11a76
commit 03a2d36c7e
7 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Audio/ALSA/ALSABackend.cpp
View File

@ -1,10 +1,12 @@
#ifndef HAVE_ALSA
#error "ALSA support disabled but still being built."
#endif
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "ALSABackend.h" #include "ALSABackend.h"
#ifdef HAVE_ALSA
static void error(int err, const char* reason) static void error(int err, const char* reason)
{ {
@ -160,5 +162,3 @@ bool ALSABackend::AddData(const void* src, u32 num_samples)
return true; return true;
} }
#endif

6
rpcs3/Emu/Audio/ALSA/ALSABackend.h
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#ifdef HAVE_ALSA #ifndef HAVE_ALSA
#error "ALSA support disabled but still being built."
#endif
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
@ -26,5 +28,3 @@ public:
virtual bool AddData(const void* src, u32 num_samples) override; virtual bool AddData(const void* src, u32 num_samples) override;
}; };
#endif

8
rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp
View File

@ -1,6 +1,8 @@
#include "FAudioBackend.h" #ifndef HAVE_FAUDIO
#error "FAudio support disabled but still being built."
#endif
#ifdef HAVE_FAUDIO #include "FAudioBackend.h"
FAudioBackend::FAudioBackend() FAudioBackend::FAudioBackend()
{ {
@ -175,5 +177,3 @@ f32 FAudioBackend::SetFrequencyRatio(f32 new_ratio)
return new_ratio; return new_ratio;
} }
#endif

6
rpcs3/Emu/Audio/FAudio/FAudioBackend.h
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#ifdef HAVE_FAUDIO #ifndef HAVE_FAUDIO
#error "FAudio support disabled but still being built."
#endif
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
#include "3rdparty/FAudio/include/FAudio.h" #include "3rdparty/FAudio/include/FAudio.h"
@ -40,5 +42,3 @@ public:
virtual u64 GetNumEnqueuedSamples() override; virtual u64 GetNumEnqueuedSamples() override;
virtual f32 SetFrequencyRatio(f32 new_ratio) override; virtual f32 SetFrequencyRatio(f32 new_ratio) override;
}; };
#endif

8
rpcs3/Emu/Audio/Pulse/PulseBackend.cpp
View File

@ -1,8 +1,10 @@
#ifndef HAVE_PULSE
#error "PulseAudio support disabled but still being built."
#endif
#include "Emu/System.h" #include "Emu/System.h"
#include "PulseBackend.h" #include "PulseBackend.h"
#ifdef HAVE_PULSE
#include <pulse/simple.h> #include <pulse/simple.h>
#include <pulse/error.h> #include <pulse/error.h>
@ -70,5 +72,3 @@ bool PulseBackend::AddData(const void* src, u32 num_samples)
return true; return true;
} }
#endif

7
rpcs3/Emu/Audio/Pulse/PulseBackend.h
View File

@ -1,6 +1,9 @@
#pragma once #pragma once
#ifdef HAVE_PULSE #ifndef HAVE_PULSE
#error "PulseAudio support disabled but still being built."
#endif
#include <pulse/simple.h> #include <pulse/simple.h>
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
@ -23,5 +26,3 @@ public:
private: private:
pa_simple *connection = nullptr; pa_simple *connection = nullptr;
}; };
#endif

20
rpcs3/Emu/CMakeLists.txt
View File

@ -88,11 +88,23 @@ target_sources(rpcs3_emu PRIVATE
target_sources(rpcs3_emu PRIVATE target_sources(rpcs3_emu PRIVATE
Audio/AudioDumper.cpp Audio/AudioDumper.cpp
Audio/AL/OpenALBackend.cpp Audio/AL/OpenALBackend.cpp
Audio/ALSA/ALSABackend.cpp
Audio/Pulse/PulseBackend.cpp
Audio/FAudio/FAudioBackend.cpp
) )
if(HAVE_ALSA)
target_sources(rpcs3_emu PRIVATE Audio/ALSA/ALSABackend.cpp)
target_link_libraries(rpcs3_emu PUBLIC 3rdparty::alsa)
endif()
if(HAVE_PULSE)
target_sources(rpcs3_emu PRIVATE Audio/Pulse/PulseBackend.cpp)
target_link_libraries(rpcs3_emu PUBLIC 3rdparty::pulse)
endif()
if(HAVE_FAUDIO)
target_sources(rpcs3_emu PRIVATE Audio/FAudio/FAudioBackend.cpp)
target_link_libraries(rpcs3_emu PUBLIC 3rdparty::faudio)
endif()
if(WIN32) if(WIN32)
target_sources(rpcs3_emu PRIVATE target_sources(rpcs3_emu PRIVATE
Audio/XAudio2/XAudio27Backend.cpp Audio/XAudio2/XAudio27Backend.cpp
@ -105,7 +117,7 @@ endif()
target_link_libraries(rpcs3_emu target_link_libraries(rpcs3_emu
PUBLIC PUBLIC
3rdparty::alsa 3rdparty::pulse 3rdparty::openal 3rdparty::faudio) 3rdparty::openal)
# Cell # Cell