|
From: Yoda-JM <yo...@us...> - 2009-07-05 10:19:49
|
Module: performous
Branch: master
Commit: a824ae19d2b4ddc195e0dbe6ef47e00d1047fdc6
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Jul 5 12:17:26 2009 +0200
Fixed juckbox mode key management
---
game/screen_songs.cc | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 3f99c37..a87f1c0 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -40,10 +40,12 @@ void ScreenSongs::manageEvent(SDL_Event event) {
int key = keysym.sym;
SDLMod mod = event.key.keysym.mod;
if (m_jukebox) {
- if (key == SDLK_ESCAPE || m_songs.empty()) { m_jukebox = false; return; }
- if (key == SDLK_RETURN) sm->activateScreen("Sing");
- if (key == SDLK_UP) m_audio.seek(5);
- if (key == SDLK_DOWN) m_audio.seek(-5);
+ if (key == SDLK_ESCAPE || m_songs.empty()) m_jukebox = false;
+ else if (key == SDLK_SPACE || (key == SDLK_PAUSE || (key == SDLK_p && mod && KMOD_CTRL))) m_audio.togglePause();
+ else if (key == SDLK_RETURN) sm->activateScreen("Sing");
+ else if (key == SDLK_UP) m_audio.seek(5);
+ else if (key == SDLK_DOWN) m_audio.seek(-5);
+ return;
}
if (key == SDLK_r && mod & KMOD_CTRL) { m_songs.reload(); m_songs.setFilter(m_search.text); }
if (!m_jukebox && m_search.process(keysym)) m_songs.setFilter(m_search.text);
|