X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=maemo%2Fmain.c;h=85db400b0696427f97737a5e2be7617e2d5ef89f;hb=refs%2Fheads%2Fmaster;hp=87e0e2c9887ca0ad35555726cb2c237c3bd37999;hpb=a76fd9535db9b36dd4d8f2e6bc9d804db807907f;p=pcsx_rearmed.git

diff --git a/maemo/main.c b/maemo/main.c
index 87e0e2c9..44fec658 100644
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -17,17 +17,12 @@
 #include "../libpcsxcore/misc.h"
 #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,9 +193,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;
 
@@ -255,10 +249,6 @@ int main(int argc, char **argv)
 		else if (!strcmp(argv[i], "-unai"))		            strcpy(Config.Gpu, "gpu_unai.so");
 		else if (!strcmp(argv[i], "-cdda"))		Config.Cdda = 1;
 		else if (!strcmp(argv[i], "-xa"))		Config.Xa = 1;
-		else if (!strcmp(argv[i], "-rcnt"))		Config.RCntFix = 1 ;
-		else if (!strcmp(argv[i], "-sio"))		Config.Sio = 1;
-		else if (!strcmp(argv[i], "-spuirq"))	Config.SpuIrq = 1;
-		else if (!strcmp(argv[i], "-vsync"))	Config.VSyncWA = 1;
 		else if (!strcmp(argv[i], "-fps")) 		            g_opts |=OPT_SHOWFPS;
 		else if (!strcmp(argv[i], "-cpu")) 		            g_opts |=OPT_SHOWCPU;
 		else if (!strcmp(argv[i], "-spu")) 		            g_opts |=OPT_SHOWSPU;
@@ -266,7 +256,7 @@ int main(int argc, char **argv)
 		else if (!strcmp(argv[i], "-mcd1")) 	            sprintf(Config.Mcd1, "%s", argv[++i]);
 		else if (!strcmp(argv[i], "-mcd2")) 	            sprintf(Config.Mcd2, "%s", argv[++i]);
 
-		else if (!strcmp(argv[i], "-cpuclock")) 	        cycle_multiplier = 10000 / atol(argv[++i]);
+		else if (!strcmp(argv[i], "-cpuclock")) 	        Config.cycle_multiplier = 10000 / atol(argv[++i]);
 		else if (!strcmp(argv[i], "-guncon")) 	            in_type1 = PSE_PAD_TYPE_GUNCON;
 		else if (!strcmp(argv[i], "-gunnotrigger")) 		g_opts |= OPT_TSGUN_NOTRIGGER;
 		else if (!strcmp(argv[i], "-analog")) 	            in_type1 = PSE_PAD_TYPE_ANALOGPAD;
@@ -288,8 +278,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;
@@ -402,7 +392,6 @@ int main(int argc, char **argv)
 	if (Config.HLE)
 		printf("Note: running without BIOS, expect compatibility problems\n");
 
-	dfinput_activate();
 	pl_timing_prepare(Config.PsxType);
 
 	while (1)