Add bgnidle (#833)

Author: NoSloppy

sound/effect.h

@@ -712,10 +712,13 @@ EFFECT(preon);
 EFFECT(pstoff);
 
 // Monophonic fonts
+
+// Idle effect, plays when blade is off.
 #ifdef ENABLE_IDLE_SOUND
 EFFECT2(idle, idle);
-EFFECT2(boot, idle);
-EFFECT2(font, idle);
+EFFECT2(bgnidle, idle);
+EFFECT2(boot, bgnidle);
+EFFECT2(font, bgnidle);
 #else
 EFFECT(boot);
 EFFECT(font);      // also polyphonic

sound/hybrid_font.h

@@ -484,12 +484,12 @@ class HybridFont : public SaberBase, public Looper {
     bool most_blades = location.on_blade(0);
 #ifdef ENABLE_IDLE_SOUND
     if (most_blades) {
-      Effect* idle = AvoidIdleSDAccess() ? nullptr : &SFX_idle;
+      Effect* bgnidle = AvoidIdleSDAccess() ? nullptr : &SFX_bgnidle;
       if (SFX_pstoff) {
         SFX_in.SetFollowing(&SFX_pstoff);
-        SFX_pstoff.SetFollowing(idle);
+        SFX_pstoff.SetFollowing(bgnidle);
       } else {
-        SFX_in.SetFollowing(idle);
+        SFX_in.SetFollowing(bgnidle);
       }
     } else {
       SFX_in.SetFollowing(nullptr);
@@ -507,7 +507,11 @@ class HybridFont : public SaberBase, public Looper {
         StopIdleSound();
         break;
       case OFF_FAST:
+#ifdef ENABLE_IDLE_SOUND
+        SFX_in.SetFollowing(&SFX_bgnidle);
+#else
         SFX_in.SetFollowing(nullptr);
+#endif
         [[gnu::fallthrough]];
       case OFF_NORMAL:
         if (!SFX_in) {
@@ -861,13 +865,14 @@ class HybridFont : public SaberBase, public Looper {
 
   void StopIdleSound() {
 #ifdef ENABLE_IDLE_SOUND
-    RefPtr<BufferedWavPlayer> idlePlayer = GetWavPlayerPlaying(&SFX_idle);
+    RefPtr<BufferedWavPlayer> idlePlayer = GetWavPlayerPlaying(&SFX_bgnidle);
+    if (!idlePlayer) idlePlayer = GetWavPlayerPlaying(&SFX_idle);
     if (idlePlayer) {
       idlePlayer->set_fade_time(0.5);
       idlePlayer->FadeAndStop();
       idlePlayer.Free();
-      PVLOG_NORMAL << "**** Stopped idle wav\n";
-      }
+      PVLOG_DEBUG << "**** Stopped idle or bgnidle wav\n";
+    }
 #endif
   }