[Scummvm-git-logs] scummvm master -> 235da5345552ae76d1320f192505fd33f44ce746

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5a7ec95377 Revert "BACKENDS: (Switch/PSP2) Fix General Midi device error"
235da53455 Revert "BACKENDS: (PSP) Fix missing General Midi device error"


Commit: 5a7ec953776ce450e8a89b07051488b788917250
    https://github.com/scummvm/scummvm/commit/5a7ec953776ce450e8a89b07051488b788917250
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2024-11-08T18:43:23+02:00

Commit Message:
Revert "BACKENDS: (Switch/PSP2) Fix General Midi device error"

This reverts commit 5fe3c560b62b5476f722214ac85116f961476b67.

Changed paths:
    backends/platform/sdl/psp2/psp2.cpp
    backends/platform/sdl/switch/switch.cpp


diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index fef88d3a1b6..1ad04f3c4d5 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -105,7 +105,6 @@ void OSystem_PSP2::initBackend() {
 	ConfMan.registerDefault("joystick_deadzone", 2);
 	ConfMan.registerDefault("touchpad_mouse_mode", false);
 	ConfMan.registerDefault("frontpanel_touchpad_mode", false);
-	ConfMan.registerDefault("gm_device", "null");
 
 	ConfMan.setBool("fullscreen", true);
 
diff --git a/backends/platform/sdl/switch/switch.cpp b/backends/platform/sdl/switch/switch.cpp
index 8d6fb126e99..09365cab1d6 100644
--- a/backends/platform/sdl/switch/switch.cpp
+++ b/backends/platform/sdl/switch/switch.cpp
@@ -82,7 +82,6 @@ void OSystem_Switch::initBackend() {
 	ConfMan.registerDefault("filtering", true);
 	ConfMan.registerDefault("output_rate", 48000);
 	ConfMan.registerDefault("touchpad_mouse_mode", false);
-	ConfMan.registerDefault("gm_device", "null");
 
 	ConfMan.setBool("fullscreen", true);
 	ConfMan.setInt("joystick_num", 0);


Commit: 235da5345552ae76d1320f192505fd33f44ce746
    https://github.com/scummvm/scummvm/commit/235da5345552ae76d1320f192505fd33f44ce746
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2024-11-08T18:43:23+02:00

Commit Message:
Revert "BACKENDS: (PSP) Fix missing General Midi device error"

This reverts commit fcddbb0fc1d3eb88cbb1dbe4f75c6c2e317f0f67.

Changed paths:
    backends/platform/psp/osys_psp.cpp


diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index fe29c220740..387594631a0 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -63,8 +63,7 @@ void OSystem_PSP::initBackend() {
 	ConfMan.registerDefault("gfx_mode", "Fit to Screen");
 	ConfMan.registerDefault("kbdmouse_speed", 3);
 	ConfMan.registerDefault("joystick_deadzone", 3);
-	ConfMan.registerDefault("gm_device", "null");
-	
+
 	// Instantiate real time clock
 	PspRtc::instance();