From fe9062671e0bd44a5949b88392ed6f75bd0d8cc5 Mon Sep 17 00:00:00 2001 From: Rui Pinheiro Date: Thu, 27 Dec 2018 01:10:58 +0000 Subject: [PATCH] Change audio tooltips, audio backend order --- rpcs3/Emu/System.h | 8 ++++---- rpcs3/Json/tooltips.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 057ebb4962..8bf517728a 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -89,13 +89,13 @@ enum class audio_renderer #ifdef _WIN32 xaudio, #endif -#ifdef HAVE_ALSA - alsa, -#endif + openal, #ifdef HAVE_PULSE pulse, #endif - openal, +#ifdef HAVE_ALSA + alsa, +#endif }; enum class camera_handler diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json index ea26000d9c..2fd48716ae 100644 --- a/rpcs3/Json/tooltips.json +++ b/rpcs3/Json/tooltips.json @@ -1,13 +1,13 @@ { "audio": { - "audioOutBox": "Always use XAudio, no exceptions.\nOpenAL uses a cross-platform approach but will have poor audio quality and stuttering sound in most games.", - "audioOutBox_Linux": "PulseAudio uses the recommended native Linux sound system and has good compatibility and sound quality. If it is unavailable on your system, ALSA is the next best alternative. \nOpenAL uses a cross-platform approach but will have poor audio quality and stuttering sound in most games.", + "audioOutBox": "XAudio2 is the recommended option and should be used whenever possible.\nOpenAL uses a cross-platform approach and is the next best alternative.", + "audioOutBox_Linux": "OpenAL uses a cross-platform approach and supports audio buffering, so it is the recommended option.\nPulseAudio uses the native Linux sound system, and is the next best alternative. If neither are available, ALSA can be used instead.", "audioDump": "Saves all audio as a raw wave file. If unsure, leave this unchecked.", "convert": "Uses 16-bit audio samples instead of default 32-bit floating point.\nUse with buggy audio drivers if you have no sound or completely broken sound.", "downmix": "Uses stereo audio output instead of default 7.1 surround sound.\nUse with stereo audio devices. Disable it only if you are using a surround sound audio system.", "masterVolume": "Controls the overall volume of the emulation.\nValues above 100% might reduce the audio quality.", - "enableBuffering": "Enables the new audio buffering features - if supported by the backend (XAudio2, OpenAL).", - "audioBufferDuration": "Target buffer duration in milliseconds.\nHigher values make the algorithm's job easier, but may introduce noticeable audio latency.", + "enableBuffering": "Enables audio buffering, which reduces crackle/stutter but increases audio latency (requires XAudio2 or OpenAL).", + "audioBufferDuration": "Target buffer duration in milliseconds.\nHigher values make the buffering algorithm's job easier, but may introduce noticeable audio latency.", "enableTimeStretching": "Enables time stretching - requires buffering to be enabled.\nReduces crackle/stutter further, but may cause a very noticeable reduction in audio quality on slower CPUs.", "timeStretchingThreshold": "Buffer fill level (in percentage) below which time stretching will start." },