diff options
| author | 2018-07-02 10:13:26 -0600 | |
|---|---|---|
| committer | 2018-07-02 21:45:47 -0400 | |
| commit | 638956aa81de255bf4bbd4e69a717eabf4ceadb9 (patch) | |
| tree | 5783dda790575e047fa757d8c56e11f3fffe7646 /src/input_common/sdl/sdl.cpp | |
| parent | Merge pull request #608 from Subv/depth (diff) | |
| download | yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.gz yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.xz yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.zip | |
Rename logging macro back to LOG_*
Diffstat (limited to 'src/input_common/sdl/sdl.cpp')
| -rw-r--r-- | src/input_common/sdl/sdl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/sdl/sdl.cpp b/src/input_common/sdl/sdl.cpp index 231a0f7af..8d117c2d4 100644 --- a/src/input_common/sdl/sdl.cpp +++ b/src/input_common/sdl/sdl.cpp | |||
| @@ -32,7 +32,7 @@ public: | |||
| 32 | explicit SDLJoystick(int joystick_index) | 32 | explicit SDLJoystick(int joystick_index) |
| 33 | : joystick{SDL_JoystickOpen(joystick_index), SDL_JoystickClose} { | 33 | : joystick{SDL_JoystickOpen(joystick_index), SDL_JoystickClose} { |
| 34 | if (!joystick) { | 34 | if (!joystick) { |
| 35 | NGLOG_ERROR(Input, "failed to open joystick {}", joystick_index); | 35 | LOG_ERROR(Input, "failed to open joystick {}", joystick_index); |
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | 38 | ||
| @@ -204,7 +204,7 @@ public: | |||
| 204 | trigger_if_greater = false; | 204 | trigger_if_greater = false; |
| 205 | } else { | 205 | } else { |
| 206 | trigger_if_greater = true; | 206 | trigger_if_greater = true; |
| 207 | NGLOG_ERROR(Input, "Unknown direction '{}'", direction_name); | 207 | LOG_ERROR(Input, "Unknown direction '{}'", direction_name); |
| 208 | } | 208 | } |
| 209 | return std::make_unique<SDLAxisButton>(GetJoystick(joystick_index), axis, threshold, | 209 | return std::make_unique<SDLAxisButton>(GetJoystick(joystick_index), axis, threshold, |
| 210 | trigger_if_greater); | 210 | trigger_if_greater); |
| @@ -235,7 +235,7 @@ public: | |||
| 235 | 235 | ||
| 236 | void Init() { | 236 | void Init() { |
| 237 | if (SDL_Init(SDL_INIT_JOYSTICK) < 0) { | 237 | if (SDL_Init(SDL_INIT_JOYSTICK) < 0) { |
| 238 | NGLOG_CRITICAL(Input, "SDL_Init(SDL_INIT_JOYSTICK) failed with: {}", SDL_GetError()); | 238 | LOG_CRITICAL(Input, "SDL_Init(SDL_INIT_JOYSTICK) failed with: {}", SDL_GetError()); |
| 239 | } else { | 239 | } else { |
| 240 | using namespace Input; | 240 | using namespace Input; |
| 241 | RegisterFactory<ButtonDevice>("sdl", std::make_shared<SDLButtonFactory>()); | 241 | RegisterFactory<ButtonDevice>("sdl", std::make_shared<SDLButtonFactory>()); |