From 04321284c0063061dd76cf4d30ac5fc6e1002425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 1 Apr 2023 08:57:42 +0200
Subject: [PATCH] Remove redundant callback

---
 Core/ControlMapper.cpp      | 12 +++++-------
 Core/ControlMapper.h        |  6 ++----
 UI/ControlMappingScreen.cpp |  1 -
 UI/EmuScreen.cpp            |  7 -------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Core/ControlMapper.cpp b/Core/ControlMapper.cpp
index cd144c5178..a97fac9358 100644
--- a/Core/ControlMapper.cpp
+++ b/Core/ControlMapper.cpp
@@ -92,14 +92,12 @@ void ConvertAnalogStick(float x, float y, float *outX, float *outY) {
 void ControlMapper::SetCallbacks(
 	std::function<void(int, bool)> onVKey,
 	std::function<void(int, float)> onVKeyAnalog,
-	std::function<void(uint32_t, uint32_t)> setAllPSPButtonStates,
-	std::function<void(int, bool)> setPSPButtonState,
+	std::function<void(uint32_t, uint32_t)> updatePSPButtons,
 	std::function<void(int, float, float)> setPSPAnalog,
 	std::function<void(int, float, float)> setRawAnalog) {
 	onVKey_ = onVKey;
 	onVKeyAnalog_ = onVKeyAnalog;
-	setAllPSPButtonStates_ = setAllPSPButtonStates;
-	setPSPButtonState_ = setPSPButtonState;
+	updatePSPButtons_ = updatePSPButtons;
 	setPSPAnalog_ = setPSPAnalog;
 	setRawAnalog_ = setRawAnalog;
 }
@@ -211,7 +209,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping) {
 	}
 
 	// We only request changing the buttons where the mapped input was involved.
-	setAllPSPButtonStates_(buttonMask & changedButtonMask, (~buttonMask) & changedButtonMask);
+	updatePSPButtons_(buttonMask & changedButtonMask, (~buttonMask) & changedButtonMask);
 
 	// OK, handle all the virtual keys next. For these we need to do deltas here and send events.
 	for (int i = 0; i < VIRTKEY_COUNT; i++) {
@@ -390,9 +388,9 @@ void ControlMapper::PSPKey(int deviceId, int pspKeyCode, int flags) {
 	} else {
 		// INFO_LOG(SYSTEM, "pspKey %d %d", pspKeyCode, flags);
 		if (flags & KEY_DOWN)
-			setPSPButtonState_(pspKeyCode, true);
+			updatePSPButtons_(pspKeyCode, 0);
 		if (flags & KEY_UP)
-			setPSPButtonState_(pspKeyCode, false);
+			updatePSPButtons_(0, pspKeyCode);
 	}
 }
 
diff --git a/Core/ControlMapper.h b/Core/ControlMapper.h
index f0fae812c9..b0e3c604e1 100644
--- a/Core/ControlMapper.h
+++ b/Core/ControlMapper.h
@@ -23,8 +23,7 @@ public:
 	void SetCallbacks(
 		std::function<void(int, bool)> onVKey,
 		std::function<void(int, float)> onVKeyAnalog,
-		std::function<void(uint32_t, uint32_t)> setAllPSPButtonStates_,
-		std::function<void(int, bool)> setPSPButtonState,
+		std::function<void(uint32_t, uint32_t)> updatePSPButtons,
 		std::function<void(int, float, float)> setPSPAnalog,
 		std::function<void(int, float, float)> setRawAnalog);
 
@@ -63,8 +62,7 @@ private:
 	// Callbacks
 	std::function<void(int, bool)> onVKey_;
 	std::function<void(int, float)> onVKeyAnalog_;
-	std::function<void(uint32_t, uint32_t)> setAllPSPButtonStates_;
-	std::function<void(int, bool)> setPSPButtonState_;
+	std::function<void(uint32_t, uint32_t)> updatePSPButtons_;
 	std::function<void(int, float, float)> setPSPAnalog_;
 	std::function<void(int, float, float)> setRawAnalog_;
 };
diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index badf788125..7d267c2b60 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -452,7 +452,6 @@ AnalogSetupScreen::AnalogSetupScreen(const Path &gamePath) : UIDialogScreenWithG
 		[](int vkey, bool down) {},
 		[](int vkey, float analogValue) {},
 		[&](uint32_t bitsToSet, uint32_t bitsToClear) {},
-		[&](int button, bool down) {},
 		[&](int stick, float x, float y) {
 			analogX_[stick] = x;
 			analogY_[stick] = y;
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index b3da268c81..3f3ac85ef2 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -181,13 +181,6 @@ EmuScreen::EmuScreen(const Path &filename)
 		[](uint32_t bitsToSet, uint32_t bitsToClear) {
 			__CtrlUpdateButtons(bitsToSet, bitsToClear);
 		},
-		[](int pspButton, bool down) {
-			if (down) {
-				__CtrlUpdateButtons(pspButton, 0);
-			} else {
-				__CtrlUpdateButtons(0, pspButton);
-			}
-		},
 		&SetPSPAnalog,
 		nullptr);