From 528cca35d5692011431f46d904209c85f3e656d6 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Tue, 12 Aug 2014 10:32:14 +0200 Subject: [PATCH] Moved some joystick related messages into log_debug, added help message for manual joystick configuration --- src/control/input_manager.cpp | 13 +++++++------ src/control/joystick_manager.cpp | 6 +++--- src/supertux/menu/joystick_menu.cpp | 7 ++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/control/input_manager.cpp b/src/control/input_manager.cpp index 10b8ba272..6f6ab3757 100644 --- a/src/control/input_manager.cpp +++ b/src/control/input_manager.cpp @@ -1,6 +1,6 @@ // SuperTux // Copyright (C) 2006 Matthias Braun , -// 2007 Ingo Ruhnke +// 2007,2014 Ingo Ruhnke // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,13 +19,14 @@ #include -#include "control/keyboard_manager.hpp" -#include "control/joystick_manager.hpp" #include "control/game_controller_manager.hpp" +#include "control/joystick_manager.hpp" +#include "control/keyboard_manager.hpp" #include "gui/menu_manager.hpp" #include "lisp/list_iterator.hpp" #include "supertux/gameconfig.hpp" #include "util/gettext.hpp" +#include "util/log.hpp" #include "util/writer.hpp" InputManager::InputManager() : @@ -140,17 +141,17 @@ InputManager::process_event(const SDL_Event& event) break; case SDL_CONTROLLERDEVICEADDED: - std::cout << "SDL_CONTROLLERDEVICEADDED" << std::endl; + log_debug << "SDL_CONTROLLERDEVICEADDED" << std::endl; game_controller_manager->on_controller_added(event.cdevice.which); break; case SDL_CONTROLLERDEVICEREMOVED: - std::cout << "SDL_CONTROLLERDEVICEREMOVED" << std::endl; + log_debug << "SDL_CONTROLLERDEVICEREMOVED" << std::endl; game_controller_manager->on_controller_removed(event.cdevice.which); break; case SDL_CONTROLLERDEVICEREMAPPED: - std::cout << "SDL_CONTROLLERDEVICEREMAPPED" << std::endl; + log_debug << "SDL_CONTROLLERDEVICEREMAPPED" << std::endl; break; default: diff --git a/src/control/joystick_manager.cpp b/src/control/joystick_manager.cpp index 423cb1cb5..f6fbbe4d5 100644 --- a/src/control/joystick_manager.cpp +++ b/src/control/joystick_manager.cpp @@ -1,5 +1,5 @@ // SuperTux -// Copyright (C) 2013 Ingo Ruhnke +// Copyright (C) 2014 Ingo Ruhnke // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ JoystickManager::~JoystickManager() void JoystickManager::on_joystick_added(int joystick_index) { - std::cout << "joydeviceadded: " << joystick_index << std::endl; + log_debug << "on_joystick_added(): " << joystick_index << std::endl; SDL_Joystick* joystick = SDL_JoystickOpen(joystick_index); if (!joystick) { @@ -109,7 +109,7 @@ JoystickManager::on_joystick_added(int joystick_index) void JoystickManager::on_joystick_removed(int instance_id) { - std::cout << "joydeviceremoved: " << static_cast(instance_id) << std::endl; + log_debug << "on_joystick_removed: " << static_cast(instance_id) << std::endl; for(auto& joy : joysticks) { SDL_JoystickID id = SDL_JoystickInstanceID(joy); diff --git a/src/supertux/menu/joystick_menu.cpp b/src/supertux/menu/joystick_menu.cpp index ca3294878..352e83bfe 100644 --- a/src/supertux/menu/joystick_menu.cpp +++ b/src/supertux/menu/joystick_menu.cpp @@ -1,6 +1,6 @@ // SuperTux // Copyright (C) 2006 Matthias Braun , -// 2007 Ingo Ruhnke +// 2007,2014 Ingo Ruhnke // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -49,8 +49,9 @@ JoystickMenu::recreate_menu() add_label(_("Setup Joystick")); add_hl(); - add_toggle(MNID_AUTO_JOYSTICK_CFG, _("Manual Joystick Configuration"), - !m_input_manager->use_game_controller()); + add_toggle(MNID_AUTO_JOYSTICK_CFG, _("Manual Configuration"), + !m_input_manager->use_game_controller()) + ->set_help(_("Use manual configuration instead of SDL2's automatic GameController support")); if (m_input_manager->use_game_controller()) { -- 2.11.0