piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10947 from Zopolis4/opensleuth

Browse Source 
Restrict OpenSLES to Android via CMake
This commit is contained in:
Admiral H. Curtiss 2023-01-30 09:02:45 +01:00 committed by GitHub
commit 8edca2039e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/AudioCommon/CMakeLists.txt
View File

@ -18,14 +18,17 @@ add_library(audiocommon
WaveFile.h WaveFile.h
) )
find_package(OpenSLES) if(ANDROID)
if(OPENSLES_FOUND) find_package(OpenSLES)
message(STATUS "OpenSLES found, enabling OpenSLES sound backend") if(OPENSLES_FOUND)
target_sources(audiocommon PRIVATE message(STATUS "OpenSLES found, enabling OpenSLES sound backend")
OpenSLESStream.cpp target_sources(audiocommon PRIVATE
OpenSLESStream.h OpenSLESStream.cpp
) OpenSLESStream.h
target_link_libraries(audiocommon PRIVATE OpenSLES::OpenSLES) )
target_link_libraries(audiocommon PRIVATE OpenSLES::OpenSLES)
target_compile_definitions(audiocommon PRIVATE HAVE_OPENSL_ES=1)
endif()
endif() endif()
if(ENABLE_ALSA) if(ENABLE_ALSA)

4
Source/Core/AudioCommon/OpenSLESStream.cpp
View File

@ -1,7 +1,7 @@
// Copyright 2013 Dolphin Emulator Project // Copyright 2013 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#ifdef ANDROID #ifdef HAVE_OPENSL_ES
#include "AudioCommon/OpenSLESStream.h" #include "AudioCommon/OpenSLESStream.h"
#include <cmath> #include <cmath>
@ -143,4 +143,4 @@ void OpenSLESStream::SetVolume(int volume)
volume <= 0 ? SL_MILLIBEL_MIN : static_cast<SLmillibel>(2000 * std::log10(volume / 100.0f)); volume <= 0 ? SL_MILLIBEL_MIN : static_cast<SLmillibel>(2000 * std::log10(volume / 100.0f));
(*bqPlayerVolume)->SetVolumeLevel(bqPlayerVolume, attenuation); (*bqPlayerVolume)->SetVolumeLevel(bqPlayerVolume, attenuation);
} }
#endif #endif // HAVE_OPENSL_ES

4
Source/Core/AudioCommon/OpenSLESStream.h
View File

@ -10,7 +10,7 @@
class OpenSLESStream final : public SoundStream class OpenSLESStream final : public SoundStream
{ {
#ifdef ANDROID #ifdef HAVE_OPENSL_ES
public: public:
~OpenSLESStream() override; ~OpenSLESStream() override;
bool Init() override; bool Init() override;
@ -21,5 +21,5 @@ public:
private: private:
std::thread thread; std::thread thread;
Common::Event soundSyncEvent; Common::Event soundSyncEvent;
#endif // HAVE_OPENSL #endif // HAVE_OPENSL_ES
}; };