zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Relaxed the FMOD version check. Anything from 4.20.00 through 4.26.xx should work

Browse source 
for both building and running now.

SVN r1712 (trunk)
This commit is contained in:
Randy Heit 2009-07-06 23:42:00 +00:00
parent 23e4c47b5b
commit ae2c4a6dbc
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/sound/fmodsound.cpp
View file

@ -671,27 +671,33 @@ bool FMODSoundRenderer::Init()
} }
const char *wrongver = NULL; const char *wrongver = NULL;
if (version < FMOD_VERSION) if (version < 0x42000)
{ {
wrongver = "an old"; wrongver = "an old";
} }
#if FMOD_VERSION < 0x42700
else if ((version & 0xFFFF00) > 0x42600)
#else
else if ((version & 0xFFFF00) > (FMOD_VERSION & 0xFFFF00)) else if ((version & 0xFFFF00) > (FMOD_VERSION & 0xFFFF00))
#endif
{ {
wrongver = "a new"; wrongver = "a new";
} }
if (wrongver != NULL) if (wrongver != NULL)
{ {
Printf (" "TEXTCOLOR_ORANGE"Error! You are using %s version of FMOD (%x.%02x.%02x).\n" Printf (" "TEXTCOLOR_ORANGE"Error! You are using %s version of FMOD (%x.%02x.%02x).\n"
" "TEXTCOLOR_ORANGE"This program requires version %x.%02x.%02x\n", " "TEXTCOLOR_ORANGE"This program was built for version %x.%02x.%02x\n",
wrongver, wrongver,
version >> 16, (version >> 8) & 255, version & 255, version >> 16, (version >> 8) & 255, version & 255,
FMOD_VERSION >> 16, (FMOD_VERSION >> 8) & 255, FMOD_VERSION & 255); FMOD_VERSION >> 16, (FMOD_VERSION >> 8) & 255, FMOD_VERSION & 255);
return false; return false;
} }
ActiveFMODVersion = version;
if (!ShowedBanner) if (!ShowedBanner)
{ {
Printf("FMOD Sound System, copyright © Firelight Technologies Pty, Ltd., 1994-2009.\n"); Printf("FMOD Sound System, copyright © Firelight Technologies Pty, Ltd., 1994-2009.\n");
Printf("Loaded FMOD version %x.%02x.%02x\n", version >> 16, (version >> 8) & 255, version & 255);
ShowedBanner = true; ShowedBanner = true;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -1285,11 +1291,31 @@ FString FMODSoundRenderer::GatherStats()
channels = 0; channels = 0;
total = update = geometry = stream = dsp = 0; total = update = geometry = stream = dsp = 0;
Sys->getChannelsPlaying(&channels); Sys->getChannelsPlaying(&channels);
Sys->getCPUUsage(&dsp, &stream,
#if FMOD_VERSION >= 0x42501 #if FMOD_VERSION >= 0x42501
&geometry, // We were built with an FMOD with the geometry parameter.
if (ActiveFMODVersion >= 0x42501)
{ // And we are running with an FMOD that includes it.
FMOD_System_GetCPUUsage((FMOD_SYSTEM *)Sys, &dsp, &stream, &geometry, &update, &total);
}
else
{ // And we are running with an FMOD that does not include it.
// Cast the function to the appropriate type and call through the cast,
// since the headers are for the newer version.
((FMOD_RESULT (F_API *)(FMOD_SYSTEM *, float *, float *, float *, float *))
FMOD_System_GetCPUUsage)((FMOD_SYSTEM *)Sys, &dsp, &stream, &update, &total);
}
#else
// Same as above, except the headers we used do not include the geometry parameter.
if (ActiveFMODVersion >= 0x42501)
{
((FMOD_RESULT (F_API *)(FMOD_SYSTEM *, float *, float *, float *, float *, float *))
FMOD_System_GetCPUUsage)((FMOD_SYSTEM *)Sys, &dsp, &stream, &geometry, &update, &total);
}
else
{
FMOD_System_GetCPUUsage((FMOD_SYSTEM *)Sys, &dsp, &stream, &update, &total);
}
#endif #endif
&update, &total);
out.Format ("%d channels,"TEXTCOLOR_YELLOW"%5.2f"TEXTCOLOR_NORMAL"%% CPU " out.Format ("%d channels,"TEXTCOLOR_YELLOW"%5.2f"TEXTCOLOR_NORMAL"%% CPU "
"(DSP:"TEXTCOLOR_YELLOW"%2.2f"TEXTCOLOR_NORMAL"%% " "(DSP:"TEXTCOLOR_YELLOW"%2.2f"TEXTCOLOR_NORMAL"%% "

1
src/sound/fmodsound.h
View file

@ -59,6 +59,7 @@ public:
void DrawWaveDebug(int mode); void DrawWaveDebug(int mode);
private: private:
DWORD ActiveFMODVersion;
int SFXPaused; int SFXPaused;
bool InitSuccess; bool InitSuccess;
bool DSPLocked; bool DSPLocked;