diff options
| author | crueter <crueter@eden-emu.dev> | 2026-09-02 00:29:58 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-09-02 00:29:58 +0200 |
| commit | aa4e494c08075f5d048e8e3d6e0f7426d88d0f0a (patch) | |
| tree | 3055c96bf4c84efcc24f768acc4545c1147f5c2d /src/common/settings_enums.h | |
| parent | 858f9e5aeac89503c331dfe4588cc3c83ab2223b (diff) | |
[android] Replace Oboe audio with SDL3 audio (#4338)
Supersedes #4335.
Replaces the Oboe audio backend with SDL3, since we already support it.
A few caveats:
- SDL defines a JVM OnLoad method already, so we have to instead hijack
NativeLibrary for id_cache initialization
- This also means some internal fields in Double/Integer/Boolean (namely
`value`) can't be accessed, so I switched those to methods for now.
- SDL Java sources are pulled in from the CI package.
- Since we can't use SDLActivity, `SDL.setupJNI()` handles everything
Signed-off-by: crueter <crueter@eden-emu.dev>
- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md)
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.
-------------------
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4338
Reviewed-by: Lizzie and Samuel <lizzie@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/common/settings_enums.h')
| -rw-r--r-- | src/common/settings_enums.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index a43df6924c..4b406f4c35 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -92,14 +92,14 @@ struct EnumMetadata { // AudioEngine must be specified discretely due to having existing but slightly different // canonicalizations // TODO (lat9nq): Remove explicit definition of AudioEngine/sink_id -enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, Oboe, }; +enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, }; template<> inline std::vector<std::pair<std::string_view, AudioEngine>> EnumMetadata<AudioEngine>::Canonicalizations() { return { {"auto", AudioEngine::Auto}, {"cubeb", AudioEngine::Cubeb}, {"sdl3", AudioEngine::Sdl3}, - {"null", AudioEngine::Null}, {"oboe", AudioEngine::Oboe}, + {"null", AudioEngine::Null}, }; } /// @brief This is just a sufficiently large number that is more than the number of other enums declared here @@ -113,7 +113,7 @@ inline AudioEngine EnumMetadata<AudioEngine>::GetFirst() { } template<> inline AudioEngine EnumMetadata<AudioEngine>::GetLast() { - return AudioEngine::Oboe; + return AudioEngine::Null; } ENUM(AudioMode, Mono, Stereo, Surround); |
