623b0621ab
* common/thread: Remove unused functions Many of these functions are carried over from Dolphin (where they aren't used anymore). Given these have no use (and we really shouldn't be screwing around with OS-specific thread scheduler handling from the emulator, these can be removed. The function for setting the thread name is left, however, since it can have debugging utility usages. * input_common/sdl: Use a type alias to shorten declaration of GetPollers Just makes the definitions a little bit more tidy. * input_common/sdl: Correct return values within implementations of GetPollers() In both cases, we weren't actually returning anything, which is undefined behavior. * yuzu/debugger/graphics_surface: Fill in missing surface format listings Fills in the missing surface types that were marked as unknown. The order corresponds with the TextureFormat enum within video_core/texture.h. We also don't need to all of these strings as translatable (only the first string, as it's an English word). * yuzu/debugger/graphics_surface: Clean up connection overload deduction We can utilize qOverload with the signal connections to make the function deducing a little less ugly. * yuzu/debugger/graphics_surface: Tidy up SaveSurface - Use QStringLiteral where applicable. - Use const where applicable - Remove unnecessary precondition check (we already assert the pixbuf being non null) * yuzu/debugger/graphics_surface: Display error messages for file I/O errors * core: Add missing override specifiers where applicable Applies the override specifier where applicable. In the case of destructors that are defaulted in their definition, they can simply be removed. This also removes the unnecessary inclusions being done in audin_u and audrec_u, given their close proximity. * kernel/thread: Make parameter of GetWaitObjectIndex() const qualified The pointed to member is never actually modified, so it can be made const. * kernel/thread: Avoid sign conversion within GetCommandBufferAddress() Previously this was performing a u64 + int sign conversion. When dealing with addresses, we should generally be keeping the arithmetic in the same signedness type. This also gets rid of the static lifetime of the constant, as there's no need to make a trivial type like this potentially live for the entire duration of the program. * kernel/codeset: Make CodeSet's memory data member a regular std::vector The use of a shared_ptr is an implementation detail of the VMManager itself when mapping memory. Because of that, we shouldn't require all users of the CodeSet to have to allocate the shared_ptr ahead of time. It's intended that CodeSet simply pass in the required direct data, and that the memory manager takes care of it from that point on. This means we just do the shared pointer allocation in a single place, when loading modules, as opposed to in each loader. * kernel/wait_object: Make ShouldWait() take thread members by pointer-to-const Given this is intended as a querying function, it doesn't make sense to allow the implementer to modify the state of the given thread.
96 lines
2.7 KiB
C++
96 lines
2.7 KiB
C++
// Copyright 2017 Citra Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <memory>
|
|
#include <thread>
|
|
#include "common/param_package.h"
|
|
#include "input_common/analog_from_button.h"
|
|
#include "input_common/keyboard.h"
|
|
#include "input_common/main.h"
|
|
#include "input_common/motion_emu.h"
|
|
#include "input_common/udp/udp.h"
|
|
#ifdef HAVE_SDL2
|
|
#include "input_common/sdl/sdl.h"
|
|
#endif
|
|
|
|
namespace InputCommon {
|
|
|
|
static std::shared_ptr<Keyboard> keyboard;
|
|
static std::shared_ptr<MotionEmu> motion_emu;
|
|
static std::unique_ptr<CemuhookUDP::State> udp;
|
|
static std::unique_ptr<SDL::State> sdl;
|
|
|
|
void Init() {
|
|
keyboard = std::make_shared<Keyboard>();
|
|
Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard);
|
|
Input::RegisterFactory<Input::AnalogDevice>("analog_from_button",
|
|
std::make_shared<AnalogFromButton>());
|
|
motion_emu = std::make_shared<MotionEmu>();
|
|
Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu);
|
|
|
|
sdl = SDL::Init();
|
|
|
|
udp = CemuhookUDP::Init();
|
|
}
|
|
|
|
void Shutdown() {
|
|
Input::UnregisterFactory<Input::ButtonDevice>("keyboard");
|
|
keyboard.reset();
|
|
Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button");
|
|
Input::UnregisterFactory<Input::MotionDevice>("motion_emu");
|
|
motion_emu.reset();
|
|
sdl.reset();
|
|
udp.reset();
|
|
}
|
|
|
|
Keyboard* GetKeyboard() {
|
|
return keyboard.get();
|
|
}
|
|
|
|
MotionEmu* GetMotionEmu() {
|
|
return motion_emu.get();
|
|
}
|
|
|
|
std::string GenerateKeyboardParam(int key_code) {
|
|
Common::ParamPackage param{
|
|
{"engine", "keyboard"},
|
|
{"code", std::to_string(key_code)},
|
|
};
|
|
return param.Serialize();
|
|
}
|
|
|
|
std::string GenerateAnalogParamFromKeys(int key_up, int key_down, int key_left, int key_right,
|
|
int key_modifier, float modifier_scale) {
|
|
Common::ParamPackage circle_pad_param{
|
|
{"engine", "analog_from_button"},
|
|
{"up", GenerateKeyboardParam(key_up)},
|
|
{"down", GenerateKeyboardParam(key_down)},
|
|
{"left", GenerateKeyboardParam(key_left)},
|
|
{"right", GenerateKeyboardParam(key_right)},
|
|
{"modifier", GenerateKeyboardParam(key_modifier)},
|
|
{"modifier_scale", std::to_string(modifier_scale)},
|
|
};
|
|
return circle_pad_param.Serialize();
|
|
}
|
|
|
|
void ReloadInputDevices() {
|
|
if (udp)
|
|
udp->ReloadUDPClient();
|
|
}
|
|
|
|
namespace Polling {
|
|
|
|
std::vector<std::unique_ptr<DevicePoller>> GetPollers(DeviceType type) {
|
|
std::vector<std::unique_ptr<DevicePoller>> pollers;
|
|
|
|
#ifdef HAVE_SDL2
|
|
pollers = sdl->GetPollers(type);
|
|
#endif
|
|
|
|
return pollers;
|
|
}
|
|
|
|
} // namespace Polling
|
|
} // namespace InputCommon
|