MinecraftConsole/src
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix sound settings not applying (#664)

Browse source 
* Fix sound settings not applying

* Remove my AllocConsole

* Forgot this printf
This commit is contained in:
GuglioIsStupid 2026-03-05 23:05:59 -05:00 committed by GitHub
parent e2b8699ba5
commit 5cbdf27b46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -260,7 +260,7 @@ void SoundEngine::updateMiniAudio()
continue; continue;
} }
float finalVolume = s->info.volume; float finalVolume = s->info.volume * m_MasterEffectsVolume;
if (finalVolume > 1.0f) if (finalVolume > 1.0f)
finalVolume = 1.0f; finalVolume = 1.0f;
@ -967,14 +967,8 @@ void SoundEngine::playMusicTick()
// AP - moved to a separate function so it can be called from the mixer callback on Vita // AP - moved to a separate function so it can be called from the mixer callback on Vita
void SoundEngine::playMusicUpdate() void SoundEngine::playMusicUpdate()
{ {
//return;
static bool firstCall = true;
static float fMusicVol = 0.0f; static float fMusicVol = 0.0f;
if( firstCall ) fMusicVol = getMasterMusicVolume();
{
fMusicVol = getMasterMusicVolume();
firstCall = false;
}
switch(m_StreamState) switch(m_StreamState)
{ {
@ -1242,7 +1236,7 @@ void SoundEngine::playMusicUpdate()
ma_sound_set_pitch(&m_musicStream, m_StreamingAudioInfo.pitch); ma_sound_set_pitch(&m_musicStream, m_StreamingAudioInfo.pitch);
float finalVolume = m_StreamingAudioInfo.volume * m_MasterMusicVolume; float finalVolume = m_StreamingAudioInfo.volume * getMasterMusicVolume();
ma_sound_set_volume(&m_musicStream, finalVolume); ma_sound_set_volume(&m_musicStream, finalVolume);
ma_result startResult = ma_sound_start(&m_musicStream); ma_result startResult = ma_sound_start(&m_musicStream);
@ -1370,14 +1364,11 @@ void SoundEngine::playMusicUpdate()
} }
// volume change required? // volume change required?
if (fMusicVol != getMasterMusicVolume()) if (m_musicStreamActive)
{ {
if (m_musicStreamActive) float finalVolume = m_StreamingAudioInfo.volume * fMusicVol;
{
float finalVolume = m_StreamingAudioInfo.volume * fMusicVol;
ma_sound_set_volume(&m_musicStream, finalVolume); ma_sound_set_volume(&m_musicStream, finalVolume);
}
} }
} }
} }