Name "Nokia/Sony/Samsung" input setting as just "Default"

It is the actual default now anyway, since Canvas abstracts all supported device inputs to its own and this mapping is the most common out there.
TASEmulators · Dec 12, 2024 · 2337449 · raidenii · Dec 12, 2024 · AShiningRay
1 parent be978e5
commit 2337449
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/src/libretro/freej2me_libretro.c b/src/libretro/freej2me_libretro.c
@@ -315,7 +315,7 @@ static void check_variables(bool first_time_startup)
 	var.key = "freej2me_phone";
 	if (Environ(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
 	{
-		if (!strcmp(var.value, "Nokia/Sony/Samsung (Standard)"))      { phoneType = 0; }
+		if (!strcmp(var.value, "Default"))                 { phoneType = 0; }
 		else if (!strcmp(var.value, "LG"))                 { phoneType = 1; }
 		else if (!strcmp(var.value, "Motorola/SoftBank"))  { phoneType = 2; }
 		else if (!strcmp(var.value, "Motorola Triplets"))  { phoneType = 3; }

diff --git a/src/libretro/freej2me_libretro.h b/src/libretro/freej2me_libretro.h
@@ -171,18 +171,18 @@ struct retro_core_option_v2_definition core_options[] =
         "Due to the different mobile phone manufacturers on the J2ME space, it's usual to have some games expecting a certain phone's key layout like Nokia's for example. If a game is not responding to the inputs correctly, try changing this option.",
         "system_settings",
         {
-            { "LG",                            NULL },
-            { "Motorola/SoftBank",             NULL },
-            { "Motorola Triplets",             NULL },
-            { "Motorola V8",                   NULL },
-            { "Nokia/Sony/Samsung (Standard)", NULL },
-            { "Nokia Keyboard",                NULL },
-            { "Sagem",                         NULL },
-            { "Siemens",                       NULL },
-            { "Siemens Old",                   NULL },
+            { "Default",             NULL },
+            { "LG",                  NULL },
+            { "Motorola/SoftBank",   NULL },
+            { "Motorola Triplets",   NULL },
+            { "Motorola V8",         NULL },
+            { "Nokia Keyboard",      NULL },
+            { "Sagem",               NULL },
+            { "Siemens",             NULL },
+            { "Siemens Old",         NULL },
             { NULL, NULL },
         },
-        "Nokia/Sony/Samsung (Standard)"
+        "Default"
     },
     {
         "freej2me_fps",
@@ -462,18 +462,18 @@ struct retro_core_option_definition core_options_v1 [] =
         "Phone Key Layout",
         "Due to the different mobile phone manufacturers on the J2ME space, it's usual to have some games expecting a certain phone's key layout like Nokia's for example. If a game is not responding to the inputs correctly, try changing this option.",
         {
-            { "LG",                            NULL },
-            { "Motorola/SoftBank",             NULL },
-            { "Motorola Triplets",             NULL },
-            { "Motorola V8",                   NULL },
-            { "Nokia/Sony/Samsung (Standard)", NULL },
-            { "Nokia Keyboard",                NULL },
-            { "Sagem",                         NULL },
-            { "Siemens",                       NULL },
-            { "Siemens Old",                   NULL },
+            { "Default",             NULL },
+            { "LG",                  NULL },
+            { "Motorola/SoftBank",   NULL },
+            { "Motorola Triplets",   NULL },
+            { "Motorola V8",         NULL },
+            { "Nokia Keyboard",      NULL },
+            { "Sagem",               NULL },
+            { "Siemens",             NULL },
+            { "Siemens Old",         NULL },
             { NULL, NULL },
         },
-        "Nokia/Sony/Samsung (Standard)"
+        "Default"
     },
     {
         "freej2me_fps",
@@ -665,7 +665,7 @@ static const struct retro_variable vars[] =
     },
     { /* Phone Control Type */
         "freej2me_phone",
-        "Phone Key Layout; Nokia/Sony/Samsung (Standard)|LG|Motorola/SoftBank|Motorola Triplets|Motorola V8|Nokia Keyboard|Sagem|Siemens|Siemens Old" 
+        "Phone Key Layout; Default|LG|Motorola/SoftBank|Motorola Triplets|Motorola V8|Nokia Keyboard|Sagem|Siemens|Siemens Old" 
     },
     { /* Game FPS limit */
         "freej2me_fps",

diff --git a/src/org/recompile/freej2me/AWTGUI.java b/src/org/recompile/freej2me/AWTGUI.java
@@ -165,7 +165,7 @@ public final class AWTGUI
 
 	final CheckboxMenuItem[] layoutOptions = 
 	{
-		new CheckboxMenuItem("Nokia/Sony/Samsung (Standard)", true),
+		new CheckboxMenuItem("Default", true),
 		new CheckboxMenuItem("LG", false),
 		new CheckboxMenuItem("Motorola/SoftBank", false),
 		new CheckboxMenuItem("Motorola V8", false),