From 043db1841ee46ace0f6919bfdf6ac20a539faaca Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Thu, 20 Jul 2023 14:55:38 +1000 Subject: [PATCH] Voice: Minor options menu fixes, fix decibel level freezing on muted speakers --- .../interface/opensb/voicechat/voicechat.lua | 1 + .../optionsmenu/optionsmenu.config.patch | 3 ++- assets/opensb/interface/optionsmenu/shine.png | Bin 0 -> 4562 bytes assets/opensb/sfx/interface/voice_off.ogg | Bin 0 -> 12926 bytes assets/opensb/sfx/interface/voice_on.ogg | Bin 0 -> 13933 bytes source/frontend/StarVoice.cpp | 15 ++++++--------- 6 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 assets/opensb/interface/optionsmenu/shine.png create mode 100644 assets/opensb/sfx/interface/voice_off.ogg create mode 100644 assets/opensb/sfx/interface/voice_on.ogg diff --git a/assets/opensb/interface/opensb/voicechat/voicechat.lua b/assets/opensb/interface/opensb/voicechat/voicechat.lua index 4e9f7e7..974b5b1 100644 --- a/assets/opensb/interface/opensb/voicechat/voicechat.lua +++ b/assets/opensb/interface/opensb/voicechat/voicechat.lua @@ -223,5 +223,6 @@ end function voiceToggle() set("enabled", not settings.enabled) + widget.playSound(fmt("/sfx/interface/voice_%s.ogg", settings.enabled and "on" or "off"), 0) updateVoiceButton() end \ No newline at end of file diff --git a/assets/opensb/interface/optionsmenu/optionsmenu.config.patch b/assets/opensb/interface/optionsmenu/optionsmenu.config.patch index 68b27f9..8866793 100644 --- a/assets/opensb/interface/optionsmenu/optionsmenu.config.patch +++ b/assets/opensb/interface/optionsmenu/optionsmenu.config.patch @@ -42,6 +42,7 @@ "base" : "/interface/optionsmenu/tricontrolsbutton.png", "hover" : "/interface/optionsmenu/tricontrolsbuttonhover.png" }, - "sfxValueLabel" : { "position" : [192, 142] } // this is 2px too low in vanilla lol + "sfxValueLabel" : { "position" : [192, 142] }, // this is 2px too low in vanilla lol + "musicSlider" : { "position" : [62, 126] } } } \ No newline at end of file diff --git a/assets/opensb/interface/optionsmenu/shine.png b/assets/opensb/interface/optionsmenu/shine.png new file mode 100644 index 0000000000000000000000000000000000000000..0117c5fc62d78181e872f20582d2027c3b69e35c GIT binary patch literal 4562 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 Qf2>r_UEn(Kz^cxF0vrS9x&QzG literal 0 HcmV?d00001 diff --git a/assets/opensb/sfx/interface/voice_off.ogg b/assets/opensb/sfx/interface/voice_off.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7a9d2fb617bb0e199c1af7494d74f2c6739badd9 GIT binary patch literal 12926 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 literal 0 HcmV?d00001 diff --git a/assets/opensb/sfx/interface/voice_on.ogg b/assets/opensb/sfx/interface/voice_on.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c00633cc4e9e21f414650a4360913dd24b44f91e GIT binary patch literal 13933 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 literal 0 HcmV?d00001 diff --git a/source/frontend/StarVoice.cpp b/source/frontend/StarVoice.cpp index fdc10ea..82205bd 100644 --- a/source/frontend/StarVoice.cpp +++ b/source/frontend/StarVoice.cpp @@ -362,13 +362,14 @@ void Voice::mix(int16_t* buffer, size_t frameCount, unsigned channels) { VoiceAudioStream* audio = speaker->audioStream.get(); MutexLocker audioLock(audio->mutex); if (speaker->playing && !audio->samples.empty()) { + for (size_t i = 0; i != samples; ++i) + speakerBuffer[i] = audio->take(); + + if (speaker != m_clientSpeaker) + speaker->decibelLevel = getAudioLoudness(speakerBuffer.data(), samples); + if (!speaker->muted) { mix = true; - for (size_t i = 0; i != samples; ++i) - speakerBuffer[i] = audio->take(); - - if (speaker != m_clientSpeaker) - speaker->decibelLevel = getAudioLoudness(speakerBuffer.data(), samples); float volume = speaker->volume; Array2F levels = speaker->channelVolumes; @@ -396,10 +397,6 @@ void Voice::mix(int16_t* buffer, size_t frameCount, unsigned channels) { } //*/ } - else { - for (size_t i = 0; i != samples; ++i) - audio->take(); - } ++it; } else {