Menu
▾
▴
[Performous-commit] Tapio Vierros : Rename CTRL_UP/DOWN to more sensible VOLUME_UP/DOWN.
|
From: Tapio V. <aa...@us...> - 2010-01-07 14:08:41
|
Module: performous
Branch: master
Commit: 1755b0dec4303ca967f63f97852b16056c3160db
Author: Tapio Vierros <tap...@gm...>
Date: Thu Jan 7 16:07:28 2010 +0200
Rename CTRL_UP/DOWN to more sensible VOLUME_UP/DOWN.
---
game/joystick.cc | 4 ++--
game/joystick.hh | 2 +-
game/screen_configuration.cc | 4 ++--
game/screen_intro.cc | 4 ++--
game/screen_practice.cc | 4 ++--
game/screen_sing.cc | 4 ++--
game/screen_songs.cc | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/game/joystick.cc b/game/joystick.cc
index 544e44e..95adf32 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -84,8 +84,8 @@ input::NavButton input::getNav(SDL_Event const &e) {
else if (k == SDLK_PAGEUP) return input::MOREUP;
else if (k == SDLK_PAGEDOWN) return input::MOREDOWN;
else if (k == SDLK_PAUSE || (k == SDLK_p && mod & KMOD_CTRL)) return input::PAUSE;
- else if (k == SDLK_UP && mod & KMOD_CTRL) return input::CTRL_UP;
- else if (k == SDLK_DOWN && mod & KMOD_CTRL) return input::CTRL_DOWN;
+ else if (k == SDLK_UP && mod & KMOD_CTRL) return input::VOLUME_UP;
+ else if (k == SDLK_DOWN && mod & KMOD_CTRL) return input::VOLUME_DOWN;
} else if (e.type == SDL_JOYBUTTONDOWN) {
// Joystick buttons
unsigned int joy_id = e.jbutton.which;
diff --git a/game/joystick.hh b/game/joystick.hh
index 8507dac..5b8aa43 100644
--- a/game/joystick.hh
+++ b/game/joystick.hh
@@ -17,7 +17,7 @@
namespace input {
enum DevType { GUITAR, DRUMS, DANCEPAD };
- enum NavButton { NONE, UP, DOWN, LEFT, RIGHT, START, SELECT, CANCEL, PAUSE, MOREUP, MOREDOWN, CTRL_UP, CTRL_DOWN };
+ enum NavButton { NONE, UP, DOWN, LEFT, RIGHT, START, SELECT, CANCEL, PAUSE, MOREUP, MOREDOWN, VOLUME_UP, VOLUME_DOWN };
static const std::size_t BUTTONS = 10;
static const int STARPOWER_BUTTON = 5;
diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc
index 552faf7..3f1f653 100644
--- a/game/screen_configuration.cc
+++ b/game/screen_configuration.cc
@@ -32,8 +32,8 @@ void ScreenConfiguration::manageEvent(SDL_Event event) {
else if (nav == input::DOWN && selected + 1 < configuration.size()) ++selected;
else if (nav == input::LEFT) --*ci;
else if (nav == input::RIGHT) ++*ci;
- else if (nav == input::CTRL_DOWN) --config["audio/preview_volume"];
- else if (nav == input::CTRL_UP) ++config["audio/preview_volume"];
+ else if (nav == input::VOLUME_DOWN) --config["audio/preview_volume"];
+ else if (nav == input::VOLUME_UP) ++config["audio/preview_volume"];
} else if (event.type == SDL_KEYDOWN) {
int key = event.key.keysym.sym;
SDLMod modifier = event.key.keysym.mod;
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 0230c23..a49057a 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -40,8 +40,8 @@ void ScreenIntro::manageEvent(SDL_Event event) {
if (nav == input::CANCEL) selected = m_menuOptions.size() - 1; // Move cursor to quit
else if (nav == input::DOWN || nav == input::RIGHT || nav == input::MOREDOWN) ++selected;
else if (nav == input::UP || nav == input::LEFT || nav == input::MOREUP) --selected;
- else if (nav == input::CTRL_DOWN) --config["audio/preview_volume"];
- else if (nav == input::CTRL_UP) ++config["audio/preview_volume"];
+ else if (nav == input::VOLUME_DOWN) --config["audio/preview_volume"];
+ else if (nav == input::VOLUME_UP) ++config["audio/preview_volume"];
else if (nav == input::START) {
std::string screen = m_menuOptions[selected].screen;
if (screen.empty()) sm->finished(); else sm->activateScreen(screen);
diff --git a/game/screen_practice.cc b/game/screen_practice.cc
index 0b4e5a8..07c30fb 100644
--- a/game/screen_practice.cc
+++ b/game/screen_practice.cc
@@ -38,8 +38,8 @@ void ScreenPractice::manageEvent(SDL_Event event) {
input::NavButton nav(input::getNav(event));
if (nav == input::CANCEL || nav == input::START || nav == input::SELECT) sm->activateScreen("Intro");
else if (nav == input::PAUSE) m_audio.togglePause();
- else if (nav == input::CTRL_DOWN) --config["audio/music_volume"];
- else if (nav == input::CTRL_UP) ++config["audio/music_volume"];
+ else if (nav == input::VOLUME_DOWN) --config["audio/music_volume"];
+ else if (nav == input::VOLUME_UP) ++config["audio/music_volume"];
else if (event.type == SDL_JOYBUTTONDOWN // Play drum sounds here
&& input::Private::devices[event.jbutton.which].type_match(input::DRUMS)) {
int b = input::buttonFromSDL(input::Private::devices[event.jbutton.which].type(), event.jbutton.button);
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 59ecb06..43e5f44 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -238,8 +238,8 @@ void ScreenSing::manageEvent(SDL_Event event) {
}
}
// Volume control
- if (nav == input::CTRL_UP) ++config["audio/music_volume"];
- if (nav == input::CTRL_DOWN) --config["audio/music_volume"];
+ if (nav == input::VOLUME_UP) ++config["audio/music_volume"];
+ if (nav == input::VOLUME_DOWN) --config["audio/music_volume"];
}
// Ctrl combinations that can be used while performing (not when score dialog is displayed)
if (event.type == SDL_KEYDOWN && (event.key.keysym.mod & KMOD_CTRL) && !m_score_window.get()) {
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index f5e3f78..a91785f 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -83,8 +83,8 @@ void ScreenSongs::manageEvent(SDL_Event event) {
else if (nav == input::DOWN) m_songs.sortChange(1);
else if (nav == input::MOREUP) m_songs.advance(-10);
else if (nav == input::MOREDOWN) m_songs.advance(10);
- else if (nav == input::CTRL_DOWN) --config["audio/preview_volume"];
- else if (nav == input::CTRL_UP) ++config["audio/preview_volume"];
+ else if (nav == input::VOLUME_DOWN) --config["audio/preview_volume"];
+ else if (nav == input::VOLUME_UP) ++config["audio/preview_volume"];
else manageSharedKey(nav);
// Handle less common, keyboard only keys
} else if (event.type == SDL_KEYDOWN) {
|
