Skip to content

Fix volume config handling. #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyperbx merged 1 commit into from
Aug 15, 2025
Merged

Fix volume config handling. #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions MarathonRecomp/app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ void App::Restart(std::vector<std::string> restartArgs)

void App::Exit()
{
// TODO (Hyper): remove this once the new options menu is implemented.
if (auto pAudioEngine = Sonicteam::AudioEngineXenon::GetInstance())
{
Config::MusicVolume = pAudioEngine->m_MusicVolume;
Config::EffectsVolume = pAudioEngine->m_EffectsVolume;
}

Config::Save();

#ifdef _WIN32
Expand Down
5 changes: 3 additions & 2 deletions MarathonRecomp/patches/audio_patches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ void AudioPatches::Update(float deltaTime)
if (!pAudioEngine)
return;

const float musicVolume = Config::MusicVolume * Config::MasterVolume;
if (Config::MusicAttenuation && CanAttenuate())
{
auto time = 1.0f - expf(2.5f * -deltaTime);
Expand All @@ -42,11 +43,11 @@ void AudioPatches::Update(float deltaTime)
}
else
{
pAudioEngine->m_MusicVolume = std::lerp(pAudioEngine->m_MusicVolume, Config::MusicVolume, time);
pAudioEngine->m_MusicVolume = std::lerp(pAudioEngine->m_MusicVolume, musicVolume, time);
}
}
else
{
pAudioEngine->m_MusicVolume = Config::MusicVolume;
pAudioEngine->m_MusicVolume = musicVolume;
}
}
Loading