Minor fixes for the AudioController.Update() at 2D Tutorial (#89)

nahaharo · Hyunwook Ha · SimonDarksideJ · web-flow · commit 1793359d0482 · 2025-08-13T16:00:14.000+02:00
* Add index++ to 2D Tutorial's AudioController.Update() * Update Code according to MonoGame/docs.monogame.github.io#148 --------- Co-authored-by: Hyunwook Ha <hyunwookha@gmail.com> Co-authored-by: Simon (Darkside) Jackson <darkside@zenithmoon.com>
diff --git a/Tutorials/learn-monogame-2d/src/15-Audio-Controller/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/15-Audio-Controller/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/16-Working-With-SpriteFonts/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/16-Working-With-SpriteFonts/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/17-Scenes/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/17-Scenes/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/18-Texture-Wrapping/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/18-Texture-Wrapping/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/19-User-Interface-Fundamentals/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/19-User-Interface-Fundamentals/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/20-Implementing-UI-With-Gum/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/20-Implementing-UI-With-Gum/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/21-Customizing-Gum-UI/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/21-Customizing-Gum-UI/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/22-Snake-Game-Mechanics/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/22-Snake-Game-Mechanics/MonoGameLibrary/Audio/AudioController.cs
@@ -97,21 +97,21 @@ public AudioController()
 
     /// <summary>
     /// Updates this audio controller
-    /// </summary>
+        /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/23-Completing-The-Game/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/23-Completing-The-Game/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/24-Shaders/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/24-Shaders/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/25-Packaging-Game/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/25-Packaging-Game/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/27-Conclusion/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/27-Conclusion/MonoGameLibrary/Audio/AudioController.cs
@@ -100,18 +100,18 @@ public AudioController()
     /// </summary>
     public void Update()
     {
-        int index = 0;
-
-        while (index < _activeSoundEffectInstances.Count)
+        for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)
         {
-            SoundEffectInstance instance = _activeSoundEffectInstances[index];
+            SoundEffectInstance instance = _activeSoundEffectInstances[i];
 
-            if (instance.State == SoundState.Stopped && !instance.IsDisposed)
+            if (instance.State == SoundState.Stopped)
             {
-                instance.Dispose();
+                if (!instance.IsDisposed)
+                {
+                    instance.Dispose();
+                }
+                _activeSoundEffectInstances.RemoveAt(i);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -100,18 +100,18 @@ public AudioController()`
`100`	`100`	`/// </summary>`
`101`	`101`	`public void Update()`
`102`	`102`	`{`
`103`		`- int index = 0;`
`104`		`-`
`105`		`- while (index < _activeSoundEffectInstances.Count)`
	`103`	`+ for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)`
`106`	`104`	`{`
`107`		`- SoundEffectInstance instance = _activeSoundEffectInstances[index];`
	`105`	`+ SoundEffectInstance instance = _activeSoundEffectInstances[i];`
`108`	`106`
`109`		`- if (instance.State == SoundState.Stopped && !instance.IsDisposed)`
	`107`	`+ if (instance.State == SoundState.Stopped)`
`110`	`108`	`{`
`111`		`- instance.Dispose();`
	`109`	`+ if (!instance.IsDisposed)`
	`110`	`+ {`
	`111`	`+ instance.Dispose();`
	`112`	`+ }`
	`113`	`+ _activeSoundEffectInstances.RemoveAt(i);`
`112`	`114`	`}`
`113`		`-`
`114`		`- _activeSoundEffectInstances.RemoveAt(index);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -97,21 +97,21 @@ public AudioController()`
`97`	`97`
`98`	`98`	`/// <summary>`
`99`	`99`	`/// Updates this audio controller`
`100`		`- /// </summary>`
	`100`	`+ /// </summary>`
`101`	`101`	`public void Update()`
`102`	`102`	`{`
`103`		`- int index = 0;`
`104`		`-`
`105`		`- while (index < _activeSoundEffectInstances.Count)`
	`103`	`+ for (int i = _activeSoundEffectInstances.Count - 1; i >= 0; i--)`
`106`	`104`	`{`
`107`		`- SoundEffectInstance instance = _activeSoundEffectInstances[index];`
	`105`	`+ SoundEffectInstance instance = _activeSoundEffectInstances[i];`
`108`	`106`
`109`		`- if (instance.State == SoundState.Stopped && !instance.IsDisposed)`
	`107`	`+ if (instance.State == SoundState.Stopped)`
`110`	`108`	`{`
`111`		`- instance.Dispose();`
	`109`	`+ if (!instance.IsDisposed)`
	`110`	`+ {`
	`111`	`+ instance.Dispose();`
	`112`	`+ }`
	`113`	`+ _activeSoundEffectInstances.RemoveAt(i);`
`112`	`114`	`}`
`113`		`-`
`114`		`- _activeSoundEffectInstances.RemoveAt(index);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`