Merge pull request #13239 from hrydgard/interface-audio

Add sound effects for PPSSPP interface navigation
hrydgard · Aug 3, 2020 · ed946ed · ed946ed
2 parents 74a9edd + b77d954
commit ed946ed
Show file tree

Hide file tree

Showing 25 changed files with 437 additions and 230 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -433,6 +433,7 @@ static ConfigSetting generalSettings[] = {
 	ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion),
 	ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true),
 	ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false),  // Or maybe it makes sense to have it per-game? Race conditions abound...
+	ConfigSetting("UISound", &g_Config.bUISound, false, true, false),
 
 	ReportedConfigSetting("NumWorkerThreads", &g_Config.iNumWorkerThreads, &DefaultNumWorkers, true, true),
 	ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, true, true),

diff --git a/Core/Config.h b/Core/Config.h
@@ -196,6 +196,7 @@ struct Config {
 	int iMaxRecent;
 	int iCurrentStateSlot;
 	int iRewindFlipFrequency;
+	bool bUISound;
 	bool bEnableStateUndo;
 	int iAutoLoadSaveState; // 0 = off, 1 = oldest, 2 = newest, >2 = slot number + 3
 	bool bEnableCheats;

diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
@@ -1882,11 +1882,11 @@ static u32 sceMpegAvcCopyYCbCr(u32 mpeg, u32 sourceAddr, u32 YCbCrAddr)
 
 	MpegContext *ctx = getMpegCtx(mpeg);
 	if (!ctx) {
-		WARN_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x): bad mpeg handle", mpeg, sourceAddr, YCbCrAddr);
+		ERROR_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x): bad mpeg handle", mpeg, sourceAddr, YCbCrAddr);
 		return -1;
 	}
 
-	ERROR_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x)", mpeg, sourceAddr, YCbCrAddr);
+	WARN_LOG(ME, "UNIMPL sceMpegAvcCopyYCbCr(%08x, %08x, %08x)", mpeg, sourceAddr, YCbCrAddr);
 	return 0;
 }
 

diff --git a/Core/WaveFile.cpp b/Core/WaveFile.cpp
@@ -1,7 +1,7 @@
 // Copyright 2008 Dolphin Emulator Project
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
-#ifndef MOBILE_DEVICE
+
 #include <string>
 
 #include "Core/WaveFile.h"
@@ -105,4 +105,3 @@ void WaveFileWriter::AddStereoSamples(const short* sample_data, u32 count)
 	file.WriteBytes(sample_data, count * 4);
 	audio_size += count * 4;
 }
-#endif
diff --git a/Core/WaveFile.h b/Core/WaveFile.h
@@ -11,7 +11,6 @@
 // ---------------------------------------------------------------------------------
 
 #pragma once
-#ifndef MOBILE_DEVICE
 
 #include <array>
 #include <string>
@@ -40,6 +39,3 @@ class WaveFileWriter
 	void Write(u32 value);
 	void Write4(const char* ptr);
 };
-
-#endif
-