fix startXFadeIfNeeded for loops across buf bounds

elgiano · Apr 26, 2022 · e43de7a · e43de7a
1 parent 3e25f72
commit e43de7a
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/plugins/XPlayBuf/XPlayBuf.cpp b/plugins/XPlayBuf/XPlayBuf.cpp
@@ -153,9 +153,17 @@ void XPlayBuf::startXFade() {
 
 void XPlayBuf::startXFadeIfNeeded(int32 iphase) {
   if (!m_isLooping) return;
-  bool posNeedsToStartFade = m_playbackRate > 0 ?
-    iphase >= m_currLoop.fadeoutFrame :
-    iphase <= m_currLoop.rFadeoutFrame;
+  bool posNeedsToStartFade;
+
+  if(m_currLoop.isEndGTStart) {
+      posNeedsToStartFade = m_playbackRate > 0 ?
+          iphase >= m_currLoop.fadeoutFrame :
+          iphase <= m_currLoop.rFadeoutFrame;
+  } else {
+      posNeedsToStartFade = m_playbackRate > 0 ?
+          iphase >= m_currLoop.fadeoutFrame && iphase < m_currLoop.end :
+          iphase <= m_currLoop.rFadeoutFrame && iphase > m_currLoop.start;
+  }
   if (posNeedsToStartFade) startXFade();
 }