Update SfxPlayer to take ConfigurationProvider as a dependency. Coupl…

…es configuration value check to playing of a given sound effect.
ethanmoffat · May 17, 2022 · f195251 · f195251
1 parent 110887c
commit f195251
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/EndlessClient/Audio/SfxPlayer.cs b/EndlessClient/Audio/SfxPlayer.cs
@@ -1,5 +1,6 @@
 using AutomaticTypeMapper;
 using EndlessClient.Content;
+using EOLib.Config;
 using Microsoft.Xna.Framework.Audio;
 using System;
 
@@ -9,37 +10,44 @@ namespace EndlessClient.Audio
     public sealed class SfxPlayer : ISfxPlayer
     {
         private readonly IContentProvider _contentProvider;
+        private readonly IConfigurationProvider _configurationProvider;
+
         private SoundEffectInstance _loopingSfx;
 
-        public SfxPlayer(IContentProvider contentProvider)
+        public SfxPlayer(IContentProvider contentProvider,
+                         IConfigurationProvider configurationProvider)
         {
             _contentProvider = contentProvider;
+            _configurationProvider = configurationProvider;
         }
 
         public void PlaySfx(SoundEffectID id)
         {
+            if (!_configurationProvider.SoundEnabled)
+                return;
+
             _contentProvider.SFX[id].Play();
         }
 
         public void PlayHarpNote(int index)
         {
-            if (index < 0 || index >= _contentProvider.HarpNotes.Count)
+            if (!_configurationProvider.SoundEnabled || index < 0 || index >= _contentProvider.HarpNotes.Count)
                 return;
 
             _contentProvider.HarpNotes[index].Play();
         }
 
         public void PlayGuitarNote(int index)
         {
-            if (index < 0 || index >= _contentProvider.GuitarNotes.Count)
+            if (!_configurationProvider.SoundEnabled || index < 0 || index >= _contentProvider.GuitarNotes.Count)
                 return;
 
             _contentProvider.GuitarNotes[index].Play();
         }
 
         public void PlayLoopingSfx(SoundEffectID id)
         {
-            if (_loopingSfx != null && _loopingSfx.State != SoundState.Stopped)
+            if (!_configurationProvider.SoundEnabled || (_loopingSfx != null && _loopingSfx.State != SoundState.Stopped))
                 return;
 
             StopLoopingSfx();