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

Emu: some cleanup

Browse source
This commit is contained in:
Megamouse 2021-04-07 23:05:18 +02:00
parent a3e8a61547
commit 03b76b4606
149 changed files with 957 additions and 1139 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/main_application.cpp
View file

@ -2,7 +2,6 @@
#include "util/types.hpp"
#include "util/logs.hpp"
#include "util/atomic.hpp"
#include "Input/pad_thread.h"
#include "Emu/System.h"
@ -48,7 +47,7 @@ EmuCallbacks main_application::CreateCallbacks()
callbacks.init_kb_handler = [this]()
{
switch (keyboard_handler type = g_cfg.io.keyboard)
switch (g_cfg.io.keyboard.get())
{
case keyboard_handler::null:
{
@ -62,13 +61,12 @@ EmuCallbacks main_application::CreateCallbacks()
ret->SetTargetWindow(m_game_window);
break;
}
default: fmt::throw_exception("Invalid keyboard handler: %s", type);
}
};
callbacks.init_mouse_handler = [this]()
{
switch (mouse_handler type = g_cfg.io.mouse)
switch (g_cfg.io.mouse.get())
{
case mouse_handler::null:
{
@ -90,7 +88,6 @@ EmuCallbacks main_application::CreateCallbacks()
ret->SetTargetWindow(m_game_window);
break;
}
default: fmt::throw_exception("Invalid mouse handler: %s", type);
}
};
@ -102,7 +99,7 @@ EmuCallbacks main_application::CreateCallbacks()
callbacks.get_audio = []() -> std::shared_ptr<AudioBackend>
{
std::shared_ptr<AudioBackend> result;
switch (audio_renderer type = g_cfg.audio.renderer)
switch (g_cfg.audio.renderer.get())
{
case audio_renderer::null: result = std::make_shared<NullAudioBackend>(); break;
#ifdef _WIN32
@ -119,7 +116,6 @@ EmuCallbacks main_application::CreateCallbacks()
#ifdef HAVE_FAUDIO
case audio_renderer::faudio: result = std::make_shared<FAudioBackend>(); break;
#endif
default: fmt::throw_exception("Invalid audio renderer: %s", type);
}
if (!result->Initialized())