citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #3578 from daniellimws/input-common-fmt 

input_common: Migrate logging macros
This commit is contained in:
Weiyi Wang 2018-03-25 13:46:54 +03:00 committed by GitHub
parent 9283053701 4617fec970
commit 0ad63c73bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_common/sdl/sdl.cpp
View File

@ -32,7 +32,7 @@ public:
explicit SDLJoystick(int joystick_index) explicit SDLJoystick(int joystick_index)
: joystick{SDL_JoystickOpen(joystick_index), SDL_JoystickClose} { : joystick{SDL_JoystickOpen(joystick_index), SDL_JoystickClose} {
if (!joystick) { if (!joystick) {
LOG_ERROR(Input, "failed to open joystick %d", joystick_index); NGLOG_ERROR(Input, "failed to open joystick {}", joystick_index);
} }
} }
@ -204,7 +204,7 @@ public:
trigger_if_greater = false; trigger_if_greater = false;
} else { } else {
trigger_if_greater = true; trigger_if_greater = true;
LOG_ERROR(Input, "Unknown direction %s", direction_name.c_str()); NGLOG_ERROR(Input, "Unknown direction {}", direction_name);
} }
return std::make_unique<SDLAxisButton>(GetJoystick(joystick_index), axis, threshold, return std::make_unique<SDLAxisButton>(GetJoystick(joystick_index), axis, threshold,
trigger_if_greater); trigger_if_greater);
@ -235,7 +235,7 @@ public:
void Init() { void Init() {
if (SDL_Init(SDL_INIT_JOYSTICK) < 0) { if (SDL_Init(SDL_INIT_JOYSTICK) < 0) {
LOG_CRITICAL(Input, "SDL_Init(SDL_INIT_JOYSTICK) failed with: %s", SDL_GetError()); NGLOG_CRITICAL(Input, "SDL_Init(SDL_INIT_JOYSTICK) failed with: {}", SDL_GetError());
} else { } else {
using namespace Input; using namespace Input;
RegisterFactory<ButtonDevice>("sdl", std::make_shared<SDLButtonFactory>()); RegisterFactory<ButtonDevice>("sdl", std::make_shared<SDLButtonFactory>());