Skip to content

M
mpd
Commit e6f334a0 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

mod: removed boolean globals for lazy init

The variables mod_mikModInitiated and mod_mikModInitError were used to control lazy initialization, but they are superfluous now.
parent bb15c3bd
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
src/decoder/mod_plugin.c
View file @ e6f334a0
...@@ -92,25 +92,15 @@ static MDRIVER drv_mpd = { ...@@ -92,25 +92,15 @@ static MDRIVER drv_mpd = {
VC_VoiceRealVolume VC_VoiceRealVolume
}; };
static bool mod_mikModInitiated;
static bool mod_mikModInitError;
static bool mod_initMikMod(void) static bool mod_initMikMod(void)
{ {
static char params[] = ""; static char params[] = "";
if (mod_mikModInitError)
return false;
if (!mod_mikModInitiated) {
mod_mikModInitiated = true;
md_device = 0; md_device = 0;
md_reverb = 0; md_reverb = 0;
MikMod_RegisterDriver(&drv_mpd); MikMod_RegisterDriver(&drv_mpd);
MikMod_RegisterAllLoaders(); MikMod_RegisterAllLoaders();
}
md_pansep = 64; md_pansep = 64;
md_mixfreq = 44100; md_mixfreq = 44100;
...@@ -120,7 +110,6 @@ static bool mod_initMikMod(void) ...@@ -120,7 +110,6 @@ static bool mod_initMikMod(void)
if (MikMod_Init(params)) { if (MikMod_Init(params)) {
ERROR("Could not init MikMod: %s\n", ERROR("Could not init MikMod: %s\n",
MikMod_strerror(MikMod_errno)); MikMod_strerror(MikMod_errno));
mod_mikModInitError = true;
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment