archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-05 22:41:18 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

make fade out and stop separate actions

Browse source
This commit is contained in:
goeiecool9999 2024-12-09 17:31:04 +01:00
parent 92721a023e
commit aec4462000
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Cafe/HW/Latte/Core/LatteShaderCache.cpp
View file

@ -167,13 +167,14 @@ class BootSoundPlayer
BootSoundPlayer() = default;
~BootSoundPlayer()
{
StopSound();
m_stopRequested = true;
}
void StartSound()
{
if (!m_bootSndPlayThread.joinable())
{
m_fadeOutRequested = false;
m_stopRequested = false;
m_volumeFactor = 1.0f;
m_bootSndPlayThread = std::thread{[this]() {
@ -182,9 +183,9 @@ class BootSoundPlayer
}
}
void StopSound()
void FadeOutSound()
{
m_stopRequested = true;
m_fadeOutRequested = true;
}
void ApplyFadeOutEffect(std::span<sint16> samples, float fadeStep)
@ -239,7 +240,7 @@ class BootSoundPlayer
constexpr sint32 audioBlockSize = samplesPerBlock * (bitsPerSample/8) * nChannels;
BootSoundReader bootSndFileReader(bootSndFileHandle, audioBlockSize);
while(m_volumeFactor > 0)
while(m_volumeFactor > 0 && !m_stopRequested)
{
while (bootSndAudioDev->NeedAdditionalBlocks())
{
@ -247,11 +248,10 @@ class BootSoundPlayer
if(data == nullptr)
{
// break outer loop
m_volumeFactor = 0.0f;
m_stopRequested = true;
break;
}
if(m_stopRequested)
if(m_fadeOutRequested)
ApplyFadeOutEffect({data, samplesPerBlock * 2}, 1.0f / (sampleRate * 10.0f));
bootSndAudioDev->FeedBlock(data);
@ -266,6 +266,7 @@ class BootSoundPlayer
private:
std::thread m_bootSndPlayThread;
std::atomic_bool m_fadeOutRequested = false;
std::atomic_bool m_stopRequested = false;
float m_volumeFactor = 1.0f;
};
@ -485,7 +486,7 @@ void LatteShaderCache_Load()
if (g_shaderCacheLoaderState.textureDRCId)
g_renderer->DeleteTexture(g_shaderCacheLoaderState.textureDRCId);
g_bootSndPlayer.StopSound();
g_bootSndPlayer.FadeOutSound();
}
void LatteShaderCache_ShowProgress(const std::function <bool(void)>& loadUpdateFunc, bool isPipelines)