Added AudioManager.Play(SoundEffectInstance) which plays using the ma…

…ster volume
vchelaru · Jan 1, 2024 · 1a0fd3a · 1a0fd3a
1 parent 10766fd
commit 1a0fd3a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Audio/AudioManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Audio/AudioManager.cs
@@ -602,7 +602,7 @@ public static void Play(SoundEffect soundEffect, float volume, float pitch = 0,
             }
 #endif
             ///////////////////Early Out////////////////////////////////
-            if(!AreSongsEnabled || ScreenManager.IsInEditMode)
+            if(!AreSoundEffectsEnabled || ScreenManager.IsInEditMode)
             {
                 return;
             }
@@ -692,6 +692,29 @@ public static int GetNumberOfTimesCurrentlyPlaying(SoundEffect soundEffect) =>
             mSoundEffectPlayInfos.Count(item => item.SoundEffect == soundEffect);
         #endregion
 
+        #region SoundEffectInstance
+
+        public static void Play(SoundEffectInstance soundEffectInstance)
+        {
+            ///////////////////Early Out////////////////////////////////
+            if (!AreSoundEffectsEnabled || ScreenManager.IsInEditMode)
+            {
+                return;
+            }
+            ///////////////End Early Out////////////////////////////////
+
+            //bool shouldPlay = SoundEffectPlayingBehavior == Audio.SoundEffectPlayingBehavior.PlayAlways ||
+            // 
+            //    mSoundsPlayedThisFrame.Contains(soundEffectInstance.Name) == false;
+
+            soundEffectInstance.Volume = MasterSoundVolume;
+            soundEffectInstance.Play();
+
+            // todo - store information about max sound effects playing?
+        }
+
+        #endregion
+
         #region Manager methods
 
 

diff --git a/FRBDK/Glue/OfficialPlugins/ContentPreview/Views/WavPreviewView.xaml.cs b/FRBDK/Glue/OfficialPlugins/ContentPreview/Views/WavPreviewView.xaml.cs
@@ -72,6 +72,7 @@ internal void PlaySound()
             catch(Exception e)
             {
                 GlueCommands.Self.PrintError(Localization.Texts.ErrorPlayingWavFile + "\n" + e);
+                GlueCommands.Self.DialogCommands.FocusTab(Localization.Texts.Output);
             }
         }
     }

diff --git a/.../Glue/OfficialPlugins/ErrorReportingPlugin/ViewModels/ContentPipelineMismatchViewModel.cs b/.../Glue/OfficialPlugins/ErrorReportingPlugin/ViewModels/ContentPipelineMismatchViewModel.cs
@@ -23,7 +23,9 @@ public ContentPipelineMismatchViewModel(ReferencedFileSave rfsUsingContentPipeli
             this.rfsUsingContentPipeline = rfsUsingContentPipeline;
 
             this.Details = "The two files " + rfsUsingContentPipeline + " and " + rfsNotUsingContentPipeline +
-                " have the same file name but one is using the content pipeline and the other is not.  This can cause runtime errors.";
+                $" have the same file name.\n{rfsUsingContentPipeline} is using the content pipeline." +
+                $"\n{rfsNotUsingContentPipeline} is not." +
+                $"\nThis can cause runtime errors.";
         }
 
         public override void HandleDoubleClick()
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ internal void PlaySound() @@
                 catch(Exception e)
                 {
                     GlueCommands.Self.PrintError(Localization.Texts.ErrorPlayingWavFile + "\n" + e);
+                    GlueCommands.Self.DialogCommands.FocusTab(Localization.Texts.Output);
                 }
             }
         }
@@ Expand Down @@