minor backend update.

ZDoom · Dec 28, 2023 · d352f56 · d352f56
1 parent 542997a
commit d352f56
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -1033,6 +1033,7 @@ set (PCH_SOURCES
 	common/2d/v_drawtext.cpp
 	common/2d/v_draw.cpp
 	common/2d/wipe.cpp
+	common/thirdparty/animlib.cpp
 	common/thirdparty/gain_analysis.cpp
 	common/thirdparty/sfmt/SFMT.cpp
 	common/startscreen/startscreen.cpp
@@ -1061,7 +1062,6 @@ set (PCH_SOURCES
 	common/textures/skyboxtexture.cpp
 	common/textures/animtexture.cpp
 	common/textures/v_collection.cpp
-	common/textures/animlib.cpp
 	common/textures/formats/automaptexture.cpp
 	common/textures/formats/brightmaptexture.cpp
 	common/textures/formats/buildtexture.cpp

diff --git a/source/common/audio/music/music.cpp b/source/common/audio/music/music.cpp
@@ -716,7 +716,6 @@ bool S_ChangeMusic(const char* musicname, int order, bool looping, bool force)
 	}
 
 	ZMusic_MusicStream handle = nullptr;
-	MidiDeviceSetting* devp = MidiDevices.CheckKey(musicname);
 
 	// Strip off any leading file:// component.
 	if (strncmp(musicname, "file://", 7) == 0)
@@ -751,6 +750,8 @@ bool S_ChangeMusic(const char* musicname, int order, bool looping, bool force)
 	else
 	{
 		int lumpnum = mus_cb.FindMusic(musicname);
+		MidiDeviceSetting* devp = MidiDevices.CheckKey(lumpnum);
+
 		auto volp = MusicVolumes.CheckKey(lumpnum);
 		if (volp)
 		{

diff --git a/source/common/audio/music/s_music.h b/source/common/audio/music/s_music.h
@@ -68,7 +68,7 @@ struct MidiDeviceSetting
 	FString args;
 };
 
-typedef TMap<FName, MidiDeviceSetting> MidiDeviceMap;
+typedef TMap<int, MidiDeviceSetting> MidiDeviceMap;
 typedef TMap<int, float> MusicVolumeMap;
 
 extern MidiDeviceMap MidiDevices;

diff --git a/source/common/rendering/v_video.cpp b/source/common/rendering/v_video.cpp
@@ -103,8 +103,9 @@ CUSTOM_CVAR(Int, vid_preferbackend, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_N
 	{
 #ifdef HAVE_GLES2
 	case 3:
-	case 2:
 		self = 2;
+		return; // beware of recursions here. Assigning to 'self' will recursively call this handler again.
+	case 2:
 		Printf("Selecting OpenGLES 2.0 backend...\n");
 		break;
 #endif

diff --git a/source/common/textures/animlib.cpp → source/common/thirdparty/animlib.cpp b/source/common/textures/animlib.cpp → source/common/thirdparty/animlib.cpp
diff --git a/source/common/textures/animlib.h → source/common/thirdparty/animlib.h b/source/common/textures/animlib.h → source/common/thirdparty/animlib.h
diff --git a/source/core/music/s_advsound.cpp b/source/core/music/s_advsound.cpp
@@ -277,7 +277,7 @@ static void S_AddSNDINFO (int lump)
 
 			case SI_MidiDevice: {
 				sc.MustGetString();
-				FName nm = sc.String;
+				int lumpnum = mus_cb.FindMusic(sc.String);
 				FScanner::SavedPos save = sc.SavePos();
 
 				sc.SetCMode(true);
@@ -310,7 +310,7 @@ static void S_AddSNDINFO (int lump)
 					sc.RestorePos(save);
 					sc.MustGetString();
 				}
-				MidiDevices[nm] = devset;
+				if (lumpnum >= 0) MidiDevices[lumpnum] = devset;
 				}
 				break;