diff options
Diffstat (limited to 'maemo')
-rw-r--r-- | maemo/hildon.c | 5 | ||||
-rw-r--r-- | maemo/main.c | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/maemo/hildon.c b/maemo/hildon.c index bd895c9..7e9cd9f 100644 --- a/maemo/hildon.c +++ b/maemo/hildon.c @@ -805,7 +805,7 @@ void plat_step_volume(int is_up) { } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { const int vDuration = 10; @@ -817,7 +817,8 @@ void plat_trigger_vibrate(int is_strong) "req_start_manual_vibration"); if (msg) { dbus_message_iter_init_append(msg, &args); - int speed = is_strong ? 200 : 150; + // FIXME: somebody with hardware should tune this + int speed = high; // is_strong ? 200 : 150; int duration = vDuration; if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &speed)) { if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &duration)) { diff --git a/maemo/main.c b/maemo/main.c index 87e0e2c..85db400 100644 --- a/maemo/main.c +++ b/maemo/main.c @@ -18,16 +18,13 @@ #include "../libpcsxcore/cdriso.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/dfinput/main.h" +#include "../plugins/dfsound/spu_config.h" #include "maemo_common.h" extern int in_enable_vibration; extern int cycle_multiplier; extern int in_type1, in_type2; -// sound plugin -extern int iUseReverb; -extern int iUseInterpolation; - accel_option accelOptions; int ready_to_go, g_emu_want_quit, g_emu_resetting; int g_menuscreen_w, g_menuscreen_h; @@ -198,8 +195,8 @@ int main(int argc, char **argv) Config.PsxAuto = 1; pl_rearmed_cbs.frameskip = -1; strcpy(Config.Bios, "HLE"); - iUseReverb = 0; - iUseInterpolation = 0; + spu_config.iUseReverb = 1; + spu_config.iUseInterpolation = 1; in_type1 = PSE_PAD_TYPE_STANDARD; in_type2 = PSE_PAD_TYPE_STANDARD; @@ -288,8 +285,8 @@ int main(int argc, char **argv) } } - else if (!strcmp(argv[i], "-spu_reverb")) { if (atol(argv[++i]) > 0) iUseReverb = 2; } - else if (!strcmp(argv[i], "-spu_interpolation")) iUseInterpolation = atol(argv[++i]); + else if (!strcmp(argv[i], "-spu_reverb")) spu_config.iUseReverb = atol(argv[++i]); + else if (!strcmp(argv[i], "-spu_interpolation")) spu_config.iUseInterpolation = atol(argv[++i]); else if (!strcmp(argv[i], "-enhance")) pl_rearmed_cbs.gpu_neon.enhancement_enable = 1; else if (!strcmp(argv[i], "-enhancehack")) pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1; |