history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 17:55:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move controller creation to System class, switch shared_ptr to unique_ptr

Browse Source
This commit is contained in:
Connor McLaughlin
2019-12-14 23:20:24 +10:00
parent 5fd421860a
commit ea0845d5ad
14 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/pad.cpp
View File

@ -95,6 +95,16 @@ bool Pad::DoState(StateWrapper& sw)
return !sw.HasError();
}
void Pad::SetController(u32 slot, std::unique_ptr<Controller> dev)
{
m_controllers[slot] = std::move(dev);
}
void Pad::SetMemoryCard(u32 slot, std::unique_ptr<MemoryCard> dev)
{
m_memory_cards[slot] = std::move(dev);
}
u32 Pad::ReadRegister(u32 offset)
{
switch (offset)
@ -289,8 +299,8 @@ void Pad::DoTransfer()
{
Log_DebugPrintf("Transferring slot %d", m_JOY_CTRL.SLOT.GetValue());
const std::shared_ptr<Controller>& controller = m_controllers[m_JOY_CTRL.SLOT];
const std::shared_ptr<MemoryCard>& memory_card = m_memory_cards[m_JOY_CTRL.SLOT];
Controller* const controller = m_controllers[m_JOY_CTRL.SLOT].get();
MemoryCard* const memory_card = m_memory_cards[m_JOY_CTRL.SLOT].get();
// set rx?
m_JOY_CTRL.RXEN = true;