Improve accuracy of CStreamingSound::UpdateFadeOut

happyhavoc · Feb 17, 2024 · db5dad3 · db5dad3
1 parent 9e674ed
commit db5dad3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/zwave.cpp b/src/zwave.cpp
@@ -492,17 +492,18 @@ CStreamingSound::~CStreamingSound()
 //-----------------------------------------------------------------------------
 HRESULT CStreamingSound::UpdateFadeOut()
 {
-    if (this->m_dwIsFadingOut == 0)
-        return 0;
-
-    this->m_dwCurFadeoutProgress = this->m_dwCurFadeoutProgress + -1;
-    if (this->m_dwCurFadeoutProgress < 1)
+    if (this->m_dwIsFadingOut != 0)
     {
-        this->m_dwIsFadingOut = 0;
-        this->m_apDSBuffer[0]->Stop();
-        return 1;
+        this->m_dwCurFadeoutProgress = this->m_dwCurFadeoutProgress - 1;
+        if (this->m_dwCurFadeoutProgress <= 0)
+        {
+            this->m_dwIsFadingOut = 0;
+            this->m_apDSBuffer[0]->Stop();
+            return 1;
+        }
+        DWORD vol = ((this->m_dwCurFadeoutProgress * 5000) / this->m_dwTotalFadeout) - 5000;
+        HRESULT res = this->m_apDSBuffer[0]->SetVolume(vol);
     }
-    this->m_apDSBuffer[0]->SetVolume(((this->m_dwCurFadeoutProgress / this->m_dwTotalFadeout) * 5000) - 5000);
     return 0;
 }
 

diff --git a/src/zwave.hpp b/src/zwave.hpp
@@ -82,8 +82,8 @@ class CSound
     DWORD m_dwNumBuffers;
 
     // th06 extensions for fadeout
-    DWORD m_dwCurFadeoutProgress;
-    DWORD m_dwTotalFadeout;
+    i32 m_dwCurFadeoutProgress;
+    i32 m_dwTotalFadeout;
     DWORD m_dwIsFadingOut;
 
     HRESULT RestoreBuffer(LPDIRECTSOUNDBUFFER pDSB, BOOL *pbWasRestored);