From fab52dc04709ef9eb5110d860f02f5ccf7719c2c Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Fri, 29 Sep 2017 20:19:00 +0200 Subject: [PATCH] deactivated game controller debug messages --- src/libgame/sdl.c | 42 ++++++++++++++++++++++++++---------------- src/screens.c | 8 ++++++++ 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 214859df..14ad28fe 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -17,6 +17,8 @@ #define ENABLE_UNUSED_CODE 0 /* currently unused functions */ +#define DEBUG_JOYSTICKS 0 + /* ========================================================================= */ /* video functions */ @@ -2626,7 +2628,7 @@ boolean SDLOpenJoystick(int nr) sdl_is_controller[nr] = FALSE; #endif -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "opening joystick %d (%s)", nr, (sdl_is_controller[nr] ? "game controller" : "joystick")); #endif @@ -2648,7 +2650,7 @@ void SDLCloseJoystick(int nr) if (nr < 0 || nr >= MAX_PLAYERS) return; -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "closing joystick %d", nr); #endif @@ -2748,7 +2750,7 @@ void HandleJoystickEvent(Event *event) { #if defined(TARGET_SDL2) case SDL_CONTROLLERDEVICEADDED: -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_CONTROLLERDEVICEADDED: device %d added", event->cdevice.which); #endif @@ -2756,7 +2758,7 @@ void HandleJoystickEvent(Event *event) break; case SDL_CONTROLLERDEVICEREMOVED: -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_CONTROLLERDEVICEREMOVED: device %d removed", event->cdevice.which); #endif @@ -2764,7 +2766,7 @@ void HandleJoystickEvent(Event *event) break; case SDL_CONTROLLERAXISMOTION: -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_CONTROLLERAXISMOTION: device %d, axis %d: %d", event->caxis.which, event->caxis.axis, event->caxis.value); #endif @@ -2774,7 +2776,7 @@ void HandleJoystickEvent(Event *event) break; case SDL_CONTROLLERBUTTONDOWN: -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_CONTROLLERBUTTONDOWN: device %d, button %d", event->cbutton.which, event->cbutton.button); #endif @@ -2784,7 +2786,7 @@ void HandleJoystickEvent(Event *event) break; case SDL_CONTROLLERBUTTONUP: -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_CONTROLLERBUTTONUP: device %d, button %d", event->cbutton.which, event->cbutton.button); #endif @@ -2798,7 +2800,7 @@ void HandleJoystickEvent(Event *event) if (sdl_is_controller[event->jaxis.which]) break; -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_JOYAXISMOTION: device %d, axis %d: %d", event->jaxis.which, event->jaxis.axis, event->jaxis.value); #endif @@ -2812,7 +2814,7 @@ void HandleJoystickEvent(Event *event) if (sdl_is_controller[event->jaxis.which]) break; -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_JOYBUTTONDOWN: device %d, button %d", event->jbutton.which, event->jbutton.button); #endif @@ -2826,7 +2828,7 @@ void HandleJoystickEvent(Event *event) if (sdl_is_controller[event->jaxis.which]) break; -#if 1 +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "SDL_JOYBUTTONUP: device %d, button %d", event->jbutton.which, event->jbutton.button); #endif @@ -2873,23 +2875,30 @@ void SDLInitJoysticks() #if defined(TARGET_SDL2) num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file_base); - if (num_mappings != -1) - Error(ERR_INFO, "%d game controller base mapping(s) added", num_mappings); - else + /* the included game controller base mappings should always be found */ + if (num_mappings == -1) Error(ERR_WARN, "no game controller base mappings found"); +#if DEBUG_JOYSTICKS + else + Error(ERR_INFO, "%d game controller base mapping(s) added", num_mappings); +#endif num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file_user); - if (num_mappings != -1) - Error(ERR_INFO, "%d game controller user mapping(s) added", num_mappings); - else +#if DEBUG_JOYSTICKS + /* the personal game controller user mappings may or may not be found */ + if (num_mappings == -1) Error(ERR_WARN, "no game controller user mappings found"); + else + Error(ERR_INFO, "%d game controller user mapping(s) added", num_mappings); Error(ERR_INFO, "%d joystick(s) found:", SDL_NumJoysticks()); +#endif checked_free(mappings_file_base); checked_free(mappings_file_user); +#if DEBUG_JOYSTICKS for (i = 0; i < SDL_NumJoysticks(); i++) { const char *name, *type; @@ -2908,6 +2917,7 @@ void SDLInitJoysticks() Error(ERR_INFO, "- joystick %d (%s): '%s'", i, type, (name ? name : "(Unknown)")); } +#endif #endif } diff --git a/src/screens.c b/src/screens.c index a5bc5ac1..ce99012e 100644 --- a/src/screens.c +++ b/src/screens.c @@ -23,6 +23,10 @@ #include "init.h" #include "config.h" + +#define DEBUG_JOYSTICKS 0 + + /* screens on the info screen */ #define INFO_MODE_MAIN 0 #define INFO_MODE_TITLE 1 @@ -6585,12 +6589,14 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) name = getFormattedJoystickName(SDL_JoystickName(joystick)); +#if DEBUG_JOYSTICKS /* print info about the joystick we are watching */ Error(ERR_DEBUG, "watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick), name); Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n", SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick), SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick)); +#endif /* initialize mapping with GUID and name */ SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp)); @@ -6831,7 +6837,9 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (success) { +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping); +#endif // activate mapping for this game SDL_GameControllerAddMapping(mapping); -- 2.34.1