diff options
| author | Twinaphex | 2014-12-20 20:43:18 +0100 |
|---|---|---|
| committer | Twinaphex | 2014-12-20 20:43:18 +0100 |
| commit | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch) | |
| tree | d38e169e68e48a3ccbf8a3805f9cb87197ed894a /maemo/main.c | |
| parent | 3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff) | |
| parent | 7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff) | |
| download | pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2 pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip | |
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'maemo/main.c')
| -rw-r--r-- | maemo/main.c | 13 |
1 files changed, 5 insertions, 8 deletions
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; |