Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13248 from iota97/ui-sound-fix

Browse source 
UI sound fix
This commit is contained in:
Unknown W. Brackets 2020-08-04 19:03:26 -04:00 • committed by GitHub
commit 736ad920c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -2037,6 +2037,11 @@ set(NativeAssets
assets/rargray.png assets/rargray.png
assets/unknown.png assets/unknown.png
assets/zip.png assets/zip.png
assets/sfx_back.wav
assets/sfx_confirm.wav
assets/sfx_select.wav
assets/sfx_toggle_off.wav
assets/sfx_toggle_on.wav
source_assets/image/logo.png source_assets/image/logo.png
source_assets/image/icon_regular_72.png source_assets/image/icon_regular_72.png
) )

6
UI/NativeApp.cpp
View file

@ -446,9 +446,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
g_Discord.SetPresenceMenu(); g_Discord.SetPresenceMenu();
// TODO: Load these in the background instead of synchronously.
g_BackgroundAudio.LoadSamples();
// Make sure UI state is MENU. // Make sure UI state is MENU.
ResetUIState(); ResetUIState();
@ -710,6 +707,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
} }
#endif #endif
// TODO: Load these in the background instead of synchronously.
g_BackgroundAudio.LoadSamples();
if (!boot_filename.empty() && stateToLoad != NULL) { if (!boot_filename.empty() && stateToLoad != NULL) {
SaveState::Load(stateToLoad, -1, [](SaveState::Status status, const std::string &message, void *) { SaveState::Load(stateToLoad, -1, [](SaveState::Status status, const std::string &message, void *) {
if (!message.empty() && (!g_Config.bDumpFrames || !g_Config.bDumpVideoOutput)) { if (!message.empty() && (!g_Config.bDumpFrames || !g_Config.bDumpVideoOutput)) {