Replaced GOSoundProviderWave::getFaderLength() with the static functi…

…on get_fader_length
oleg68 · Jan 20, 2024 · cd97fc9 · cd97fc9
1 parent 1945b31
commit cd97fc9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/grandorgue/sound/GOSoundProviderWave.cpp b/src/grandorgue/sound/GOSoundProviderWave.cpp
@@ -190,6 +190,19 @@ void GOSoundProviderWave::LoadPitch(GOOpenedFile *file) {
   m_MidiPitchFract = wave.GetPitchFract();
 }
 
+static unsigned get_fader_length(unsigned midiKeyNumber) {
+  unsigned fade_length = 46;
+  if (midiKeyNumber > 0 && midiKeyNumber < 133) {
+    fade_length
+      = 184 - (int)((((float)midiKeyNumber - 42.0f) / 44.0f) * 178.0f);
+    if (midiKeyNumber < 42)
+      fade_length = 184;
+    if (midiKeyNumber > 86)
+      fade_length = 6;
+  }
+  return fade_length;
+}
+
 void GOSoundProviderWave::LoadFromOneFile(
   const GOFileStore &fileStore,
   GOMemoryPool &pool,
@@ -233,7 +246,7 @@ void GOSoundProviderWave::LoadFromOneFile(
       m_MidiPitchFract = wave.GetPitchFract();
     }
 
-    unsigned midiKeyCrossfadeLength = getFaderLength(m_MidiKeyNumber);
+    unsigned midiKeyCrossfadeLength = get_fader_length(m_MidiKeyNumber);
 
     if (use_pitch)
       m_AttackSwitchCrossfadeLength = releaseCrossfadeLength
@@ -308,19 +321,6 @@ void GOSoundProviderWave::LoadFromOneFile(
     throw loaderFilename.GenerateMessage(excText);
 }
 
-unsigned GOSoundProviderWave::getFaderLength(unsigned midiKeyNumber) {
-  unsigned fade_length = 46;
-  if (midiKeyNumber > 0 && midiKeyNumber < 133) {
-    fade_length
-      = 184 - (int)((((float)midiKeyNumber - 42.0f) / 44.0f) * 178.0f);
-    if (midiKeyNumber < 42)
-      fade_length = 184;
-    if (midiKeyNumber > 86)
-      fade_length = 6;
-  }
-  return fade_length;
-}
-
 void GOSoundProviderWave::LoadFromMultipleFiles(
   const GOFileStore &fileStore,
   GOMemoryPool &pool,

diff --git a/src/grandorgue/sound/GOSoundProviderWave.h b/src/grandorgue/sound/GOSoundProviderWave.h
@@ -127,7 +127,6 @@ class GOSoundProviderWave : public GOSoundProvider {
     unsigned max_released_time);
 
   void LoadPitch(GOOpenedFile *file);
-  static unsigned getFaderLength(unsigned midiKeyNumber);
 
 public:
   GOSoundProviderWave(GOCacheObject *pObjectFor = nullptr)