add frameskip option back in

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 91)
+set(VERSION_MINOR 92)
 
 if(BUILD_PSP2)
 if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)

README.MD

@@ -2,8 +2,12 @@ Important note to Switch users
 ======
 On the Switch, since v1.84, please use nsp injection to start uae4all2, otherwise the `config save as` and `savestate export` options will not work. On SX OS, you can do this by holding down R while launching any installed game to make hbmenu appear.
 
-Changes in this version
+Recent Changes
 ======
+1.92
+
+- add frameskip option back in
+
 1.91
 
 - widescreen menu
@@ -18,7 +22,7 @@ Use4All2 Mod is an Amiga emulator for Vita and Switch. This is my mod of this gr
 
 ![Photo of UAE4All2 running on Switch in tabletop mode](https://i.postimg.cc/3RD6Lr7j/Split-Joycon-b.jpg)
 
-Thanks to Cpasjuste for the original port and for jumping in and adding shader support and making the assembler optimizations work. 
+Thanks to Cpasjuste for the original port, for jumping in and adding shader support, for making the assembler optimizations work, and for fixing audio playback on suspend/resume in SDL2 for Switch.
 
 Thanks to ScHlAuChi for extensive testing, ideas, and for contributing the new larger virtual keyboard images.
 
@@ -301,6 +305,10 @@ Compiling
 
 CHANGELOG
 =====
+1.92
+
+- add frameskip option back in
+
 1.91
 
 - widescreen menu

src/gp2x/menu/menu_config.cpp

@@ -1613,7 +1613,6 @@ void loadconfig(int general)
         fscanf(f,"syncthreshold=%d\n", &timeslice_mode);
 #endif
         fscanf(f,"frameskip=%d\n",&mainMenu_frameskip);
-        mainMenu_frameskip = 0; // ignore framsekip option
         fscanf(f,"vkbdlanguage=%d\n",&mainMenu_vkbdLanguage);
         fscanf(f,"vkbdstyle=%d\n",&mainMenu_vkbdStyle);
         fscanf(f,"sound=%d\n",&mainMenu_sound );

src/gp2x/menu/menu_display.cpp

@@ -59,9 +59,9 @@ enum {
 #if !defined(__PSP2__) && !defined(__SWITCH__)
 	MENUDISPLAY_CUTLEFT,
 	MENUDISPLAY_CUTRIGHT,
-	MENUDISPLAY_FRAMESKIP,
 #endif
 	MENUDISPLAY_REFRESHRATE,
+	MENUDISPLAY_FRAMESKIP,
 #if defined(__PSP2__) || defined(__SWITCH__)
 	MENUDISPLAY_SHADER,
 #endif
@@ -205,21 +205,37 @@ static void draw_displayMenu(int c)
 	else
 		write_text_inv(tabstop3,menuLine,value);
 
-	// MENUDISPLAY_FRAMESKIP
+#else // !defined(__PSP2__) && !defined(__SWITCH__)
 	menuLine++;
 	write_text(leftMargin,menuLine,text_str_display_separator);
 	menuLine++;
-	write_text(leftMargin,menuLine,"Frameskip");
-	if ((mainMenu_frameskip==0)&&((menuDisplay!=MENUDISPLAY_FRAMESKIP)||(bb)))
-		write_text_inv(tabstop1,menuLine,"0");
+#endif
+	// MENUDISPLAY_REFRESHRATE
+	write_text(leftMargin,menuLine,"Refresh Rate");
+	if ((!mainMenu_ntsc)&&((menuDisplay!=MENUDISPLAY_REFRESHRATE)||(bb)))
+		write_text_inv(tabstop1,menuLine,"50Hz");
 	else
-		write_text(tabstop1,menuLine,"0");
+		write_text(tabstop1,menuLine,"50Hz");
+
+	if ((mainMenu_ntsc)&&((menuDisplay!=MENUDISPLAY_REFRESHRATE)||(bb)))
+		write_text_inv(tabstop3+1,menuLine,"60Hz");
+	else
+		write_text(tabstop3+1,menuLine,"60Hz");
+
+	// MENUDISPLAY_FRAMESKIP
 #ifdef PANDORA
+	write_text(tabstop3+7,menuLine,"Frameskip");
+	if ((mainMenu_frameskip==0)&&((menuDisplay!=MENUDISPLAY_FRAMESKIP)||(bb)))
+		write_text_inv(tabstop3+17,menuLine,"0");
+	else
+		write_text(tabstop3+17,menuLine,"0");
 	if ((mainMenu_frameskip==1)&&((menuDisplay!=MENUDISPLAY_FRAMESKIP)||(bb)))
-		write_text_inv(tabstop3,menuLine,"1");
+		write_text_inv(tabstop3+19,menuLine,"1");
 	else
-		write_text(tabstop3,menuLine,"1");
+		write_text(tabstop3+19,menuLine,"1");
 #else
+	menuLine+=2;
+	write_text(tabstop3+7,menuLine,"Frameskip");
 	if ((mainMenu_frameskip==1)&&((menuDisplay!=MENUDISPLAY_FRAMESKIP)||(bb)))
 		write_text_inv(tabstop2,menuLine,"1");
 	else
@@ -256,22 +272,6 @@ static void draw_displayMenu(int c)
 	menuLine+=2;
 #endif
 
-#else // !defined(__PSP2__) && !defined(__SWITCH__)
-	menuLine++;
-	write_text(leftMargin,menuLine,text_str_display_separator);
-	menuLine++;
-#endif
-	// MENUDISPLAY_REFRESHRATE
-	write_text(leftMargin,menuLine,"Refresh Rate");
-	if ((!mainMenu_ntsc)&&((menuDisplay!=MENUDISPLAY_REFRESHRATE)||(bb)))
-		write_text_inv(tabstop1,menuLine,"50Hz");
-	else
-		write_text(tabstop1,menuLine,"50Hz");
-
-	if ((mainMenu_ntsc)&&((menuDisplay!=MENUDISPLAY_REFRESHRATE)||(bb)))
-		write_text_inv(tabstop3+1,menuLine,"60Hz");
-	else
-		write_text(tabstop3+1,menuLine,"60Hz");
 #if defined(__PSP2__) || defined(__SWITCH__)	
 	//Shader settings on Vita
 	//MENUDISPLAY_SHADER
@@ -750,6 +750,7 @@ static int key_displayMenu(int *c)
 						mainMenu_cutRight++;
 				}
 				break;
+#endif
 			case MENUDISPLAY_FRAMESKIP:
 #ifdef PANDORA
 				if ((left)||(right))
@@ -771,7 +772,6 @@ static int key_displayMenu(int *c)
 				}
 #endif
 				break;
-#endif
 			case MENUDISPLAY_REFRESHRATE:
 				if ((left)||(right))
 						mainMenu_ntsc = !mainMenu_ntsc;