mirror of
				https://github.com/yuzu-emu/yuzu.git
				synced 2025-11-04 08:13:41 +00:00 
			
		
		
		
	Merge pull request #405 from lioncash/input
input_common: Move old logging macros over to fmt-capable ones
This commit is contained in:
		
						commit
						3e0ec3dbd7
					
				@ -32,7 +32,7 @@ public:
 | 
			
		||||
    explicit SDLJoystick(int joystick_index)
 | 
			
		||||
        : joystick{SDL_JoystickOpen(joystick_index), SDL_JoystickClose} {
 | 
			
		||||
        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;
 | 
			
		||||
            } else {
 | 
			
		||||
                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,
 | 
			
		||||
                                                   trigger_if_greater);
 | 
			
		||||
@ -235,7 +235,7 @@ public:
 | 
			
		||||
 | 
			
		||||
void Init() {
 | 
			
		||||
    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 {
 | 
			
		||||
        using namespace Input;
 | 
			
		||||
        RegisterFactory<ButtonDevice>("sdl", std::make_shared<SDLButtonFactory>());
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user