sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AnalogController: Show controller number in OSD messages

Browse Source
This commit is contained in:
Connor McLaughlin
2020-05-08 15:32:39 +10:00
parent 95468901f2
commit 9539ce032b
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/analog_controller.cpp
View File

@ -5,7 +5,7 @@
#include "system.h"
Log_SetChannel(AnalogController);
AnalogController::AnalogController(System* system) : m_system(system)
AnalogController::AnalogController(System* system, u32 index) : m_system(system), m_index(index)
{
m_axis_state.fill(0x80);
}
@ -48,7 +48,7 @@ bool AnalogController::DoState(StateWrapper& sw)
if (old_analog_mode != m_analog_mode)
{
m_system->GetHostInterface()->AddFormattedOSDMessage(2.0f, "Controller switched to %s mode.",
m_system->GetHostInterface()->AddFormattedOSDMessage(2.0f, "Controller %u switched to %s mode.", m_index + 1u,
m_analog_mode ? "analog" : "digital");
}
}
@ -90,8 +90,8 @@ void AnalogController::SetButtonState(Button button, bool pressed)
{
if (m_analog_locked)
{
m_system->GetHostInterface()->AddFormattedOSDMessage(2.0f, "Controller is locked to %s mode by the game.",
m_analog_mode ? "analog" : "digital");
m_system->GetHostInterface()->AddFormattedOSDMessage(2.0f, "Controller %u is locked to %s mode by the game.",
m_index + 1u, m_analog_mode ? "analog" : "digital");
}
else
{
@ -149,8 +149,8 @@ void AnalogController::SetAnalogMode(bool enabled)
if (m_analog_mode == enabled)
return;
Log_InfoPrintf("Controller switched to %s mode.", enabled ? "analog" : "digital");
m_system->GetHostInterface()->AddFormattedOSDMessage(2.0f, "Controller switched to %s mode.",
Log_InfoPrintf("Controller %u switched to %s mode.", m_index + 1u, enabled ? "analog" : "digital");
m_system->GetHostInterface()->AddFormattedOSDMessage(2.0f, "Controller %u switched to %s mode.", m_index + 1u,
enabled ? "analog" : "digital");
m_analog_mode = enabled;
}
@ -393,9 +393,9 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
return ack;
}
std::unique_ptr<AnalogController> AnalogController::Create(System* system)
std::unique_ptr<AnalogController> AnalogController::Create(System* system, u32 index)
{
return std::make_unique<AnalogController>(system);
return std::make_unique<AnalogController>(system, index);
}
std::optional<s32> AnalogController::StaticGetAxisCodeByName(std::string_view axis_name)