This commit is contained in:
Themaister 2010-08-16 18:53:27 +02:00
parent 38ae262d85
commit 4daa48783e
3 changed files with 9 additions and 5 deletions

View File

@ -39,7 +39,7 @@
// Chooses which video and audio subsystem to use. Remember to update config.mk if you change these. // Chooses which video and audio subsystem to use. Remember to update config.mk if you change these.
#define VIDEO_DRIVER VIDEO_GL #define VIDEO_DRIVER VIDEO_GL
#define AUDIO_DRIVER AUDIO_ALSA #define AUDIO_DRIVER AUDIO_RSOUND
//////////////// ////////////////

View File

@ -2,9 +2,9 @@
BUILD_OPENGL = 1 BUILD_OPENGL = 1
BUILD_FILTER = 0 BUILD_FILTER = 0
BUILD_RSOUND = 0 BUILD_RSOUND = 1
BUILD_OSS = 0 BUILD_OSS = 0
BUILD_ALSA = 1 BUILD_ALSA = 0
PREFIX = /usr/local PREFIX = /usr/local

8
gl.c
View File

@ -73,8 +73,12 @@ static int16_t glfw_input_state(void *data, const struct snes_keybind *snes_keyb
{ {
if ( snes_keybinds[i].id == SNES_FAST_FORWARD_KEY ) if ( snes_keybinds[i].id == SNES_FAST_FORWARD_KEY )
{ {
if ( snes_keybinds[i].joykey < joypad_buttons ) bool pressed = false;
set_fast_forward_button(buttons[snes_keybinds[i].joykey] == GLFW_PRESS); if ( glfwGetKey(snes_keybinds[i].key) )
pressed = true;
else if ( snes_keybinds[i].joykey < joypad_buttons && buttons[snes_keybinds[i].joykey] == GLFW_PRESS )
pressed = true;
set_fast_forward_button(pressed);
break; break;
} }
} }