From de638dfe6cd055db8ce265614b14d448d642156a Mon Sep 17 00:00:00 2001 From: Nuno Date: Sat, 18 Dec 2021 11:05:54 +0100 Subject: [PATCH] Remove fmod option --- ryzom/client/src/client_cfg.cpp | 1 - ryzom/client/src/client_cfg.h | 2 +- ryzom/client/src/sound_manager.cpp | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ryzom/client/src/client_cfg.cpp b/ryzom/client/src/client_cfg.cpp index 7491e9413..98ad5b9bc 100644 --- a/ryzom/client/src/client_cfg.cpp +++ b/ryzom/client/src/client_cfg.cpp @@ -1297,7 +1297,6 @@ void CClientConfig::setValues() if (varPtr) { if (nlstricmp(varPtr->asString(), "Auto") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvAuto; - else if (nlstricmp(varPtr->asString(), "FMod") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvFMod; else if (nlstricmp(varPtr->asString(), "OpenAL") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvOpenAL; else if (nlstricmp(varPtr->asString(), "DirectSound") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvDirectSound; else if (nlstricmp(varPtr->asString(), "XAudio2") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvXAudio2; diff --git a/ryzom/client/src/client_cfg.h b/ryzom/client/src/client_cfg.h index 8c0c299b4..0cf859721 100644 --- a/ryzom/client/src/client_cfg.h +++ b/ryzom/client/src/client_cfg.h @@ -58,7 +58,7 @@ using std::string; struct CClientConfig { enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D, OpenGLES }; - enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 }; + enum TDriverSound { SoundDrvAuto = 0, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 }; enum TStageLCTUsage { StageUseNoLCT = 0, StageUseAllLCT, StageUsePosOnlyLCT }; // the config file must be always be available diff --git a/ryzom/client/src/sound_manager.cpp b/ryzom/client/src/sound_manager.cpp index 572bf2c07..3253aedec 100644 --- a/ryzom/client/src/sound_manager.cpp +++ b/ryzom/client/src/sound_manager.cpp @@ -468,9 +468,7 @@ void CSoundManager::init(IProgressCallback *progressCallBack) _AudioMixer->setPackedSheetOption("", false); UAudioMixer::TDriver driverType= UAudioMixer::DriverAuto; - if(ClientCfg.DriverSound==CClientConfig::SoundDrvFMod) - driverType= UAudioMixer::DriverFMod; - else if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL) + if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL) driverType= UAudioMixer::DriverOpenAl; else if(ClientCfg.DriverSound==CClientConfig::SoundDrvDirectSound) driverType= UAudioMixer::DriverDSound;