From e3f07b33bb032a85b57001b318a3896f44b41c5e Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Wed, 19 Aug 2020 22:37:14 -0400
Subject: [PATCH] GME cleanup and fixes
Just some stuff backported from SRB2 2.2, well mostly
get_zlib_error function to reduce code duplication
Return false if it fails to load the VGZ lump
Reduce redundant calls to gme_set_equalizer
Fix sometimes loading a VGZ crashing the game
---
src/sdl/mixer_sound.c | 123 ++++++++++--------------------------------
1 file changed, 29 insertions(+), 94 deletions(-)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 1617da2a3..86fc8efb8 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -110,6 +110,27 @@ static void var_cleanup(void)
internal_volume = 100;
}
+static const char* get_zlib_error(int zErr)
+{
+ switch (zErr)
+ {
+ case Z_ERRNO:
+ return "Z_ERRNO";
+ case Z_STREAM_ERROR:
+ return "Z_STREAM_ERROR";
+ case Z_DATA_ERROR:
+ return "Z_DATA_ERROR";
+ case Z_MEM_ERROR:
+ return "Z_MEM_ERROR";
+ case Z_BUF_ERROR:
+ return "Z_BUF_ERROR";
+ case Z_VERSION_ERROR:
+ return "Z_VERSION_ERROR";
+ default:
+ return "unknown error";
+ }
+}
+
/// ------------------------
/// Audio System
/// ------------------------
@@ -371,51 +392,11 @@ void *I_GetSfx(sfxinfo_t *sfx)
}
}
else
- {
- const char *errorType;
- switch (zErr)
- {
- case Z_ERRNO:
- errorType = "Z_ERRNO"; break;
- case Z_STREAM_ERROR:
- errorType = "Z_STREAM_ERROR"; break;
- case Z_DATA_ERROR:
- errorType = "Z_DATA_ERROR"; break;
- case Z_MEM_ERROR:
- errorType = "Z_MEM_ERROR"; break;
- case Z_BUF_ERROR:
- errorType = "Z_BUF_ERROR"; break;
- case Z_VERSION_ERROR:
- errorType = "Z_VERSION_ERROR"; break;
- default:
- errorType = "unknown error";
- }
- CONS_Alert(CONS_ERROR,"Encountered %s when running inflate: %s\n", errorType, stream.msg);
- }
+ CONS_Alert(CONS_ERROR,"Encountered %s when running inflate: %s\n", get_zlib_error(zErr), stream.msg);
(void)inflateEnd(&stream);
}
else // Hold up, zlib's got a problem
- {
- const char *errorType;
- switch (zErr)
- {
- case Z_ERRNO:
- errorType = "Z_ERRNO"; break;
- case Z_STREAM_ERROR:
- errorType = "Z_STREAM_ERROR"; break;
- case Z_DATA_ERROR:
- errorType = "Z_DATA_ERROR"; break;
- case Z_MEM_ERROR:
- errorType = "Z_MEM_ERROR"; break;
- case Z_BUF_ERROR:
- errorType = "Z_BUF_ERROR"; break;
- case Z_VERSION_ERROR:
- errorType = "Z_VERSION_ERROR"; break;
- default:
- errorType = "unknown error";
- }
- CONS_Alert(CONS_ERROR,"Encountered %s when running inflateInit: %s\n", errorType, stream.msg);
- }
+ CONS_Alert(CONS_ERROR,"Encountered %s when running inflateInit: %s\n", get_zlib_error(zErr), stream.msg);
Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
#else
return NULL; // No zlib support
@@ -945,73 +926,25 @@ boolean I_LoadSong(char *data, size_t len)
// Run GME on new data
if (!gme_open_data(inflatedData, inflatedLen, &gme, 44100))
{
- gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
- gme_start_track(gme, 0);
- current_track = 0;
- gme_set_equalizer(gme, &eq);
- Mix_HookMusic(mix_gme, gme);
Z_Free(inflatedData); // GME supposedly makes a copy for itself, so we don't need this lying around
return true;
}
}
else
- {
- const char *errorType;
- switch (zErr)
- {
- case Z_ERRNO:
- errorType = "Z_ERRNO"; break;
- case Z_STREAM_ERROR:
- errorType = "Z_STREAM_ERROR"; break;
- case Z_DATA_ERROR:
- errorType = "Z_DATA_ERROR"; break;
- case Z_MEM_ERROR:
- errorType = "Z_MEM_ERROR"; break;
- case Z_BUF_ERROR:
- errorType = "Z_BUF_ERROR"; break;
- case Z_VERSION_ERROR:
- errorType = "Z_VERSION_ERROR"; break;
- default:
- errorType = "unknown error";
- }
- CONS_Alert(CONS_ERROR,"Encountered %s when running inflate: %s\n", errorType, stream.msg);
- }
+ CONS_Alert(CONS_ERROR, "Encountered %s when running inflate: %s\n", get_zlib_error(zErr), stream.msg);
(void)inflateEnd(&stream);
}
else // Hold up, zlib's got a problem
- {
- const char *errorType;
- switch (zErr)
- {
- case Z_ERRNO:
- errorType = "Z_ERRNO"; break;
- case Z_STREAM_ERROR:
- errorType = "Z_STREAM_ERROR"; break;
- case Z_DATA_ERROR:
- errorType = "Z_DATA_ERROR"; break;
- case Z_MEM_ERROR:
- errorType = "Z_MEM_ERROR"; break;
- case Z_BUF_ERROR:
- errorType = "Z_BUF_ERROR"; break;
- case Z_VERSION_ERROR:
- errorType = "Z_VERSION_ERROR"; break;
- default:
- errorType = "unknown error";
- }
- CONS_Alert(CONS_ERROR,"Encountered %s when running inflateInit: %s\n", errorType, stream.msg);
- }
+ CONS_Alert(CONS_ERROR, "Encountered %s when running inflateInit: %s\n", get_zlib_error(zErr), stream.msg);
Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
+ return false;
#else
CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
- return true;
+ return false;
#endif
}
else if (!gme_open_data(data, len, &gme, 44100))
- {
- gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
- gme_set_equalizer(gme, &eq);
return true;
- }
#endif
rw = SDL_RWFromMem(data, len);
@@ -1082,6 +1015,8 @@ boolean I_PlaySong(boolean looping)
#ifdef HAVE_LIBGME
if (gme)
{
+ gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
+ gme_set_equalizer(gme, &eq);
gme_start_track(gme, 0);
current_track = 0;
Mix_HookMusic(mix_gme, gme);
--
GitLab