From 4daa48783efbb01735cca4a2ce344fd65b2716f1 Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 16 Aug 2010 18:53:27 +0200 Subject: [PATCH] Fixes. --- config.h | 2 +- config.mk | 4 ++-- gl.c | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config.h b/config.h index 0ebed708cf..b0eaea102b 100644 --- a/config.h +++ b/config.h @@ -39,7 +39,7 @@ // Chooses which video and audio subsystem to use. Remember to update config.mk if you change these. #define VIDEO_DRIVER VIDEO_GL -#define AUDIO_DRIVER AUDIO_ALSA +#define AUDIO_DRIVER AUDIO_RSOUND //////////////// diff --git a/config.mk b/config.mk index 04fb973188..3eb6873a46 100644 --- a/config.mk +++ b/config.mk @@ -2,9 +2,9 @@ BUILD_OPENGL = 1 BUILD_FILTER = 0 -BUILD_RSOUND = 0 +BUILD_RSOUND = 1 BUILD_OSS = 0 -BUILD_ALSA = 1 +BUILD_ALSA = 0 PREFIX = /usr/local diff --git a/gl.c b/gl.c index 9a6f680ff4..c81c3f3032 100644 --- a/gl.c +++ b/gl.c @@ -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].joykey < joypad_buttons ) - set_fast_forward_button(buttons[snes_keybinds[i].joykey] == GLFW_PRESS); + bool pressed = false; + 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; } }