Implement the "Mix audio with other apps" setting on Android.

This commit is contained in:
Henrik Rydgård committed 2026-05-31 19:08:45 +02:00
1 parent 93340779e1
commit e8e357e360
4 files changed
+33 -5

No files matched your search

+11 -1
View File
@@ -825,6 +825,16 @@ std::string DefaultProAdhocServer() {
return "socom.cc";
}
bool DefaultAudioMixWithOthers() {
#if PPSSPP_PLATFORM(IOS)
// On iOS, it's generally best to mix with others by default, since users expect that and the hardware is generally good enough to handle it.
return true;
#else
// On Android, we historically took audio focus.
return false;
#endif
}
static const ConfigSetting soundSettings[] = {
ConfigSetting("Enable", SETTING(g_Config, bEnableSound), true, CfgFlag::PER_GAME),
ConfigSetting("ExtraAudioBuffering", SETTING(g_Config, bExtraAudioBuffering), false, CfgFlag::DEFAULT),
@@ -850,7 +860,7 @@ static const ConfigSetting soundSettings[] = {
ConfigSetting("AudioDevice", SETTING(g_Config, sAudioDevice), "", CfgFlag::DEFAULT),
ConfigSetting("AutoAudioDevice", SETTING(g_Config, bAutoSwitchAudioDevice), true, CfgFlag::DEFAULT),
ConfigSetting("AudioMixWithOthers", SETTING(g_Config, bAudioMixWithOthers), true, CfgFlag::DEFAULT),
ConfigSetting("AudioMixWithOthers", SETTING(g_Config, bAudioMixWithOthers), &DefaultAudioMixWithOthers, CfgFlag::DEFAULT),
ConfigSetting("AudioRespectSilentMode", SETTING(g_Config, bAudioRespectSilentMode), false, CfgFlag::DEFAULT),
ConfigSetting("UseOldAtrac", SETTING(g_Config, bUseOldAtrac), false, CfgFlag::DEFAULT),
};