archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename CallAfter to CallFromMainThread

Browse source
This commit is contained in:
Megamouse 2022-01-20 18:44:49 +01:00
parent 2d9f21a2ea
commit d172b9add6
22 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/rpcs3qt/gui_application.cpp
View file

@ -262,7 +262,7 @@ void gui_application::InitializeConnects()
#endif
qRegisterMetaType<std::function<void()>>("std::function<void()>");
connect(this, &gui_application::RequestCallAfter, this, &gui_application::HandleCallAfter);
connect(this, &gui_application::RequestCallFromMainThread, this, &gui_application::CallFromMainThread);
}
std::unique_ptr<gs_frame> gui_application::get_gs_frame()
@ -330,9 +330,9 @@ void gui_application::InitializeCallbacks()
return false;
};
callbacks.call_after = [this](std::function<void()> func)
callbacks.call_from_main_thread = [this](std::function<void()> func)
{
RequestCallAfter(std::move(func));
RequestCallFromMainThread(std::move(func));
};
callbacks.init_gs_render = []()
@ -424,7 +424,7 @@ void gui_application::InitializeCallbacks()
callbacks.play_sound = [](const std::string& path)
{
Emu.CallAfter([path]()
Emu.CallFromMainThread([path]()
{
if (fs::is_file(path))
{
@ -614,7 +614,7 @@ void gui_application::OnEmuSettingsChange()
/**
* Using connects avoids timers being unable to be used in a non-qt thread. So, even if this looks stupid to just call func, it's succinct.
*/
void gui_application::HandleCallAfter(const std::function<void()>& func)
void gui_application::CallFromMainThread(const std::function<void()>& func)
{
func();
}