RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use g_fxo for pad_handler

Browse source
This commit is contained in:
Nekotekina 2019-09-18 02:44:06 +03:00
parent 3092914527
commit 4bba1e3337
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/System.cpp
View file

@ -583,9 +583,9 @@ bool Emulator::BootRsxCapture(const std::string& path)
GetCallbacks().on_ready();
auto gsrender = fxm::import<GSRender>(Emu.GetCallbacks().get_gs_render);
auto padhandler = fxm::import<pad_thread>(Emu.GetCallbacks().get_pad_handler, "");
Emu.GetCallbacks().init_pad_handler("");
if (gsrender.get() == nullptr || padhandler.get() == nullptr)
if (gsrender.get() == nullptr)
return false;
GetCallbacks().on_run();
@ -1516,7 +1516,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
g_fxo->init();
fxm::import<GSRender>(Emu.GetCallbacks().get_gs_render); // TODO: must be created in appropriate sys_rsx syscall
fxm::import<pad_thread>(Emu.GetCallbacks().get_pad_handler, m_title_id);
Emu.GetCallbacks().init_pad_handler(m_title_id);
network_thread_init();
}
else if (ppu_prx.open(elf_file) == elf_error::ok)

2
rpcs3/Emu/System.h
View file

@ -219,7 +219,7 @@ struct EmuCallbacks
std::function<void(s32, s32)> handle_taskbar_progress; // (type, value) type: 0 for reset, 1 for increment, 2 for set_limit
std::function<std::shared_ptr<class KeyboardHandlerBase>()> get_kb_handler;
std::function<std::shared_ptr<class MouseHandlerBase>()> get_mouse_handler;
std::function<std::shared_ptr<class pad_thread>(const std::string&)> get_pad_handler;
std::function<void(std::string_view title_id)> init_pad_handler;
std::function<std::unique_ptr<class GSFrameBase>()> get_gs_frame;
std::function<std::shared_ptr<class GSRender>()> get_gs_render;
std::function<std::shared_ptr<class AudioBackend>()> get_audio;