From 99eca5948081773e196c71c4fc20597105ae8e71 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Sat, 8 Feb 2025 19:04:35 +0100
Subject: [PATCH 01/53] Create sound asset subtypes

---
 .../Sound/MusicAssetInspector.cs              |  38 +++++
 .../Sound/MusicAssetInspector.cs.meta         |  15 ++
 .../Sound/MusicAssetInspector.uxml            |   6 +
 .../Sound/MusicAssetInspector.uxml.meta       |  10 ++
 .../Sound/SoundAssetInspector.cs              |  85 +----------
 .../Sound/SoundAssetInspector.cs.meta         |   2 +-
 .../Sound/SoundAssetInspector.uxml            |   6 -
 .../Sound/SoundEffectAssetInspector.cs        |  96 ++++++++++++
 .../Sound/SoundEffectAssetInspector.cs.meta   |  15 ++
 .../Sound/SoundEffectAssetInspector.uxml      |   8 +
 .../Sound/SoundEffectAssetInspector.uxml.meta |  10 ++
 .../Sound/VoiceAssetInspector.cs              |  39 +++++
 .../Sound/VoiceAssetInspector.cs.meta         |  15 ++
 .../Sound/VoiceAssetInspector.uxml            |   3 +
 .../Sound/VoiceAssetInspector.uxml.meta       |  10 ++
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |  45 ++++++
 .../Sound/MusicAsset.cs.meta                  |  11 ++
 .../VisualPinball.Unity/Sound/MusicPlayer.cs  |  69 +++++++++
 .../Sound/MusicPlayer.cs.meta                 |  11 ++
 .../VisualPinball.Unity/Sound/SoundAsset.cs   |  80 ++++------
 .../Sound/SoundComponent.cs                   |   5 +-
 .../Sound/SoundEffectAsset.cs                 | 143 ++++++++++++++++++
 .../Sound/SoundEffectAsset.cs.meta            |  11 ++
 .../VisualPinball.Unity/Sound/SoundUtils.cs   |  80 ----------
 .../VisualPinball.Unity/Sound/VoiceAsset.cs   |  33 ++++
 .../Sound/VoiceAsset.cs.meta                  |  11 ++
 26 files changed, 638 insertions(+), 219 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
new file mode 100644
index 000000000..0cf7193ac
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
@@ -0,0 +1,38 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine.UIElements;
+using UnityEngine;
+
+namespace VisualPinball.Unity.Editor
+{
+    [CustomEditor(typeof(MusicAsset)), CanEditMultipleObjects]
+    public class MusicAssetInspector : SoundAssetInspector
+    {
+        [SerializeField] private VisualTreeAsset _musicAssetInspectorAsset;
+
+		public override VisualElement CreateInspectorGUI()
+		{
+            var root = new VisualElement();
+			var baseUi = base.CreateInspectorGUI();
+            root.Add(baseUi);
+            var subUi = _musicAssetInspectorAsset.Instantiate();
+            root.Add(subUi);
+            return root;
+		}
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs.meta
new file mode 100644
index 000000000..05694000e
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs.meta
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: ff8590e7b8c275545a4e3572fbd5346f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - _soundAssetInspectorAsset: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
+      type: 3}
+  - _musicAssetInspectorAsset: {fileID: 9197481963319205126, guid: a628fd30c34ffb74a8d1a9d170031b1c,
+      type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
new file mode 100644
index 000000000..59abaf6fc
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
@@ -0,0 +1,6 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" />
+    <uie:PropertyField binding-path="_priority" label="Priority" />
+    <uie:PropertyField binding-path="_transitionType" label="Transition Type" />
+    <uie:PropertyField binding-path="_fadeDuration" label="Fade Duration" />
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml.meta
new file mode 100644
index 000000000..22a3ac554
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a628fd30c34ffb74a8d1a9d170031b1c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
index 6d9e219da..a5cb9ad76 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
@@ -14,101 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
 using System.Threading;
 using UnityEditor;
 using UnityEngine.UIElements;
 using UnityEngine;
-using UnityEditor.UIElements;
-using System.Collections.Generic;
 
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(SoundAsset)), CanEditMultipleObjects]
 	public class SoundAssetInspector : UnityEditor.Editor
 	{
-		private CancellationTokenSource _allowFadeCts;
-		private CancellationTokenSource _instantCts;
-
 		[SerializeField]
-		private VisualTreeAsset _inspectorXml;
-
-		private Button _playButton;
-
+		private VisualTreeAsset _soundAssetInspectorAsset;
+		
 		public override VisualElement CreateInspectorGUI()
 		{
-			var ui = _inspectorXml.Instantiate();
-			_playButton = ui.Q<Button>("play-button");
-			_playButton.clicked += OnPlayButtonClicked;
-			var loopField = ui.Q<PropertyField>("loop");
-			var fadeInTimeField = ui.Q<PropertyField>("fade-in-time");
-			var fadeOutTimeField = ui.Q<PropertyField>("fade-out-time");
-			loopField.RegisterValueChangeCallback(e => {
-				var loop = e.changedProperty.boolValue;
-				var displayStyle = loop ? DisplayStyle.Flex : DisplayStyle.None;
-				fadeInTimeField.style.display = displayStyle;
-				fadeOutTimeField.style.display = displayStyle;
-			});
-			return ui;
-		}
-
-		private void OnEnable()
-		{
-			_allowFadeCts = new();
-			_instantCts = new();
-		}
-
-		private void OnDisable()
-		{
-			RemoveNullClips();
-			_instantCts.Cancel();
-			_instantCts.Dispose();
-			_instantCts = null;
-			_allowFadeCts.Dispose();
-			_allowFadeCts = null;
-		}
-
-		private void RemoveNullClips()
-		{
-			var clipsProp = serializedObject.FindProperty("_clips");
-			for (var i = clipsProp.arraySize -1; i >= 0; i--) {
-				if (clipsProp.GetArrayElementAtIndex(i).objectReferenceValue == null)
-					clipsProp.DeleteArrayElementAtIndex(i);
-			}
-			serializedObject.ApplyModifiedPropertiesWithoutUndo();
-		}
-
-		private async void OnPlayButtonClicked()
-		{
-			_playButton.clicked -= OnPlayButtonClicked;
-			_playButton.clicked += OnStopButtonClicked;
-			_playButton.text = "Stop";
-			try {
-				var soundAsset = target as SoundAsset;
-				await SoundUtils.PlayInEditorPreviewScene(soundAsset, _allowFadeCts.Token, _instantCts.Token);
-			} catch (OperationCanceledException) { } finally {
-				_playButton.clicked -= OnStopButtonClicked;
-				_playButton.clicked -= OnStopForrealButtonClicked;
-				_playButton.clicked += OnPlayButtonClicked;
-				_playButton.text = "Play";
-			}
-		}
-
-		private void OnStopButtonClicked()
-		{
-			_playButton.clicked -= OnStopButtonClicked;
-			_playButton.clicked += OnStopForrealButtonClicked;
-			_allowFadeCts.Cancel();
-			_allowFadeCts.Dispose();
-			_allowFadeCts = new();
-		}
-
-		private void OnStopForrealButtonClicked()
-		{
-			_playButton.clicked -= OnStopForrealButtonClicked;
-			_instantCts.Cancel();
-			_instantCts.Dispose();
-			_instantCts = new();
+			return _soundAssetInspectorAsset.Instantiate();
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs.meta
index 50b2c5a64..5acbf55e4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences:
-  - _inspectorXml: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
+  - _soundAssetInspectorAsset: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
index 4b7569fb3..f9826150c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
@@ -4,12 +4,6 @@
     <uie:PropertyField binding-path="_volume" label="Volume" name="volume" />
     <uie:PropertyField name="clips" binding-path="_clips" label="Clips" />
     <uie:PropertyField name="clip-selection-method" binding-path="_clipSelectionMethod" label="Clip Selection Method" />
-    <ui:MinMaxSlider label="Volume Range" min-value="1" max-value="1" low-limit="0" high-limit="1" tooltip="Volume will be randomized within this range (0 - 1)" binding-path="_volumeRange" name="volume-range" class="unity-base-field__aligned" />
-    <ui:MinMaxSlider label="Pitch Range" min-value="1" max-value="1" low-limit="0.5" high-limit="1.5" binding-path="_pitchRange" name="pitch-range" tooltip="Pitch will be randomized within this range (0.5 - 1.5)" class="unity-base-field__aligned" />
-    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" />
-    <uie:PropertyField name="fade-in-time" binding-path="_fadeInTime" label="Fade In Time" />
-    <uie:PropertyField name="fade-out-time" binding-path="_fadeOutTime" label="Fade Out Time" />
     <uie:PropertyField name="is-spatial" binding-path="_isSpatial" label="Is Spatial" />
     <uie:ObjectField label="Audio Mixer Group" binding-path="_audioMixerGroup" name="audio-mixer-group" type="UnityEngine.Audio.AudioMixerGroup, UnityEngine.AudioModule" class="unity-base-field__aligned" />
-    <ui:Button text="Play" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="false" name="play-button" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
new file mode 100644
index 000000000..ddb4a5266
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
@@ -0,0 +1,96 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Threading;
+using UnityEditor;
+using UnityEngine.UIElements;
+using UnityEngine;
+using Mono.Cecil.Cil;
+
+namespace VisualPinball.Unity.Editor
+{
+    [CustomEditor(typeof(SoundEffectAsset)), CanEditMultipleObjects]
+    public class SoundEffectAssetInspector : SoundAssetInspector
+    {
+        [SerializeField] private VisualTreeAsset _soundEffectAssetInspectorAsset;
+
+        private CancellationTokenSource _allowFadeCts;
+		private CancellationTokenSource _instantCts;
+        private Button _playButton;
+
+		public override VisualElement CreateInspectorGUI()
+		{
+            var root = new VisualElement();
+			var baseUi = base.CreateInspectorGUI();
+            root.Add(baseUi);
+            var subUi = _soundEffectAssetInspectorAsset.Instantiate();
+            root.Add(subUi);
+            return root;
+		}
+
+		private void OnEnable()
+		{
+			_allowFadeCts = new();
+			_instantCts = new();
+		}
+
+		private void OnDisable()
+		{
+			_instantCts.Cancel();
+			_instantCts.Dispose();
+			_instantCts = null;
+			_allowFadeCts.Dispose();
+			_allowFadeCts = null;
+		}
+
+		private async void OnPlayButtonClicked()
+		{
+			_playButton.clicked -= OnPlayButtonClicked;
+			_playButton.clicked += OnStopButtonClicked;
+			_playButton.text = "Stop";
+			try
+			{
+				var soundAsset = target as SoundEffectAsset;
+				await soundAsset.PlayInEditorPreviewScene(_allowFadeCts.Token, _instantCts.Token);
+			}
+			catch (OperationCanceledException) { }
+			finally
+			{
+				_playButton.clicked -= OnStopButtonClicked;
+				_playButton.clicked -= OnStopForrealButtonClicked;
+				_playButton.clicked += OnPlayButtonClicked;
+				_playButton.text = "Play";
+			}
+		}
+
+		private void OnStopButtonClicked()
+		{
+			_playButton.clicked -= OnStopButtonClicked;
+			_playButton.clicked += OnStopForrealButtonClicked;
+			_allowFadeCts.Cancel();
+			_allowFadeCts.Dispose();
+			_allowFadeCts = new();
+		}
+
+		private void OnStopForrealButtonClicked()
+		{
+			_playButton.clicked -= OnStopForrealButtonClicked;
+			_instantCts.Cancel();
+			_instantCts.Dispose();
+			_instantCts = new();
+		}    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs.meta
new file mode 100644
index 000000000..fe3706e0e
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs.meta
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: 1a1855717caab984d91790c7b31bb2ca
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - _soundAssetInspectorAsset: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
+      type: 3}
+  - _soundEffectAssetInspectorAsset: {fileID: 9197481963319205126, guid: 021c87a0b57b77d449760c46575f0270,
+      type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
new file mode 100644
index 000000000..171455636
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
@@ -0,0 +1,8 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" />
+    <uie:PropertyField name="fade-in-time" binding-path="_fadeInTime" label="Fade In Time" />
+    <uie:PropertyField name="fade-out-time" binding-path="_fadeOutTime" label="Fade Out Time" />
+    <ui:MinMaxSlider label="Volume Range" min-value="1" max-value="1" low-limit="0" high-limit="1" tooltip="Volume will be randomized within this range (0 - 1)" binding-path="_volumeRange" name="volume-range" class="unity-base-field__aligned" />
+    <ui:MinMaxSlider label="Pitch Range" min-value="1" max-value="1" low-limit="0.5" high-limit="1.5" binding-path="_pitchRange" name="pitch-range" tooltip="Pitch will be randomized within this range (0.5 - 1.5)" class="unity-base-field__aligned" />
+    <ui:Button text="Play" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="false" name="play-button" />
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml.meta
new file mode 100644
index 000000000..72eb91486
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 021c87a0b57b77d449760c46575f0270
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
new file mode 100644
index 000000000..402ed7bf5
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
@@ -0,0 +1,39 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine.UIElements;
+using UnityEngine;
+
+namespace VisualPinball.Unity.Editor
+{
+    [CustomEditor(typeof(VoiceAsset)), CanEditMultipleObjects]
+    public class VoiceAssetInspector : SoundAssetInspector
+    {
+        [SerializeField] private VisualTreeAsset _voiceAssetInspector;
+
+        public override VisualElement CreateInspectorGUI()
+		{
+            var root = new VisualElement();
+			var baseUi = base.CreateInspectorGUI();
+            root.Add(baseUi);
+            var subUi = _voiceAssetInspector.Instantiate();
+            root.Add(subUi);
+            return root;
+		}
+
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
new file mode 100644
index 000000000..8a01cf799
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: 25eabf71e394bd4468492886b4af8eae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - _soundAssetInspectorAsset: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
+      type: 3}
+  - voiceAssetInspector: {fileID: 9197481963319205126, guid: c4009cb1062e5514c9aedd330f512328,
+      type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
new file mode 100644
index 000000000..bf5d53a4c
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
@@ -0,0 +1,3 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <uie:PropertyField binding-path="_priority" label="Priority" />
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml.meta
new file mode 100644
index 000000000..9b1ab79ee
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: c4009cb1062e5514c9aedd330f512328
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
new file mode 100644
index 000000000..1d6369c8b
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -0,0 +1,45 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+
+    [CreateAssetMenu(fileName = "Music Asset", menuName = "Visual Pinball/Sound/Music Asset", order = 102)]
+    public class MusicAsset : SoundAsset
+    {
+        private enum PlaybackState
+        {
+            Waiting,
+            FadingIn,
+            Playing,
+            FadingOut
+        }
+
+        public override bool Loop => _loop;
+        public SoundPriority Priority => _priority;
+
+        [SerializeField] private SoundPriority _priority;
+        [SerializeField] private bool _loop;
+        [SerializeField] private MusicTransitionType _transitionType;
+        [SerializeField][Range(0f, 10f)] private float _fadeDuration;
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta
new file mode 100644
index 000000000..998d494e9
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3da6cef59ec67434e894090e6eda4c04
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
new file mode 100644
index 000000000..c18cd17e7
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -0,0 +1,69 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+    public enum MusicTransitionType
+    {
+        CrossFade,
+        FadeOut,
+    }
+
+    public class MusicPlayer : MonoBehaviour
+    {
+        [SerializeField] private MusicTransitionType _transitionType;
+
+        private readonly List<StackItem> _musicStack = new();
+        private int _stackCounter = 0;
+
+        public void InsertIntoStack(MusicAsset music, out int stackId)
+        {
+            stackId = _stackCounter;
+            _stackCounter++;
+            var stackItem = new StackItem(music, stackId);
+            var index = _musicStack.FindIndex(x => x.MusicAsset.Priority <= stackItem.MusicAsset.Priority);
+
+            if (index == -1)
+                _musicStack.Insert(index, stackItem);
+            else
+                _musicStack.Add(stackItem);
+
+
+        }
+
+        public void RemoveFromStack(int stackId)
+        {
+            var index = _musicStack.FindIndex(x => x.StackId == stackId);
+            if (index >= 0)
+                _musicStack.RemoveAt(index);
+        }
+
+        private readonly struct StackItem
+        {
+            public readonly MusicAsset MusicAsset;
+            public readonly int StackId;
+
+            public StackItem(MusicAsset musicAsset, int stackid)
+            {
+                MusicAsset = musicAsset;
+                StackId = stackid;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
new file mode 100644
index 000000000..784e8214a
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 24ce1835440b2a54f9c0886a734eb8f4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index b4861768c..94b9e38c0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -18,20 +18,35 @@
 
 using System;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEditor.SceneManagement;
+#endif
 using UnityEngine;
 using UnityEngine.Audio;
+using UnityEngine.SceneManagement;
 using Random = UnityEngine.Random;
 
 namespace VisualPinball.Unity
 {
+	public enum SoundPriority
+	{
+		Lowest,
+		Low,
+		Medium,
+		High,
+		Highest,
+	}
+
 	/// <summary>
 	/// Represents a reusable collection of similar sounds, for example different samples of a
 	/// flipper mechanism getting triggered. Supports multiple techniques to introduce variation
 	/// for frequently used sounds. Instances of this class can be stored in the project files or
 	/// in an asset library.
 	/// </summary>
-	[CreateAssetMenu(fileName = "Sound", menuName = "Visual Pinball/Sound", order = 102)]
-	public class SoundAsset : ScriptableObject
+	public abstract class SoundAsset : ScriptableObject
 	{
 		private enum SelectionMethod
 		{
@@ -39,45 +54,20 @@ private enum SelectionMethod
 			Random
 		}
 
-		[SerializeField]
-		private string _description;
-
-		[SerializeField]
-		private AudioClip[] _clips;
-
-		[SerializeField]
-		private SelectionMethod _clipSelectionMethod;
-
-		[SerializeField]
-		private Vector2 _volumeRange = new(1f, 1f);
-
-		[SerializeField]
-		private Vector2 _pitchRange = new(1f, 1f);
-
-		[SerializeField]
-		private bool _loop;
-		public bool Loop => _loop;
-
-		[SerializeField, Range(0, 10f)] private float _fadeInTime;
-		public float FadeInTime => _fadeInTime;
-
-		[SerializeField, Range(0, 10f)] private float _fadeOutTime;
-		public float FadeOutTime => _fadeOutTime;
+		public virtual bool Loop => false;
 
+		[SerializeField] private string _description;
+		[SerializeField] private AudioClip[] _clips;
+		[SerializeField] private SelectionMethod _clipSelectionMethod;
 		[Tooltip("Should the sound appear to come from the position of the emitter?")]
-		[SerializeField]
-		private bool _isSpatial = true;
-
-		[SerializeField]
-		private AudioMixerGroup _audioMixerGroup;
+		[SerializeField] private bool _isSpatial = true;
+		[SerializeField] private AudioMixerGroup _audioMixerGroup;
 
 		private int _roundRobinIndex = 0;
 
-		public void ConfigureAudioSource(AudioSource audioSource, float volume = 1)
+		public virtual void ConfigureAudioSource(AudioSource audioSource, float volume = 1)
 		{
-			audioSource.volume = volume * Random.Range(_volumeRange.x, _volumeRange.y);
-			audioSource.pitch = Random.Range(_pitchRange.x, _pitchRange.y);
-			audioSource.loop = _loop;
+			audioSource.volume = volume;
 			audioSource.clip = GetClip();
 			audioSource.spatialBlend = _isSpatial ? 0f : 1f;
 			audioSource.outputAudioMixerGroup = _audioMixerGroup;
@@ -85,14 +75,13 @@ public void ConfigureAudioSource(AudioSource audioSource, float volume = 1)
 
 		public bool IsValid()
 		{
-			if (_clips == null) {
+			if (_clips == null)
 				return false;
-			}
 
-			foreach (var clip in _clips) {
-				if (clip != null) {
+			foreach (var clip in _clips)
+			{
+				if (clip != null)
 					return true;
-				}
 			}
 
 			return false;
@@ -100,21 +89,18 @@ public bool IsValid()
 
 		private AudioClip GetClip()
 		{
-			if (_clips.Length == 0) {
+			_clips.ToList().RemoveAll(clip => clip == null);
+			if (_clips.Length == 0)
 				throw new InvalidOperationException($"The sound asset '{name}' has no audio clips to play.");
-			}
-
-			switch (_clipSelectionMethod) {
-
+			switch (_clipSelectionMethod)
+			{
 				case SelectionMethod.RoundRobin:
 					_roundRobinIndex %= _clips.Length;
 					var clip = _clips[_roundRobinIndex];
 					_roundRobinIndex++;
 					return clip;
-
 				case SelectionMethod.Random:
 					return _clips[Random.Range(0, _clips.Length)];
-
 				default:
 					throw new NotImplementedException("Selection method not implemented.");
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index 036337534..3976fc344 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -32,8 +32,7 @@ namespace VisualPinball.Unity
 	public class SoundComponent : EnableAfterAwakeComponent
 	{
 		[SerializeReference]
-		public SoundAsset _soundAsset;
-
+		protected SoundEffectAsset _soundAsset;
 		[SerializeField]
 		[Tooltip("Should the sound be interrupted if it is triggered again while already playing?")]
 		protected bool _interrupt;
@@ -86,7 +85,7 @@ public async Task Play(float volume = 1f)
 			try {
 				var combinedVol = _volume * volume;
 				_lastPlayStartTime = Time.unscaledTime;
-				await SoundUtils.Play(_soundAsset, gameObject, _allowFadeCts.Token, _instantCts.Token, combinedVol);
+				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, combinedVol);
 			} catch (OperationCanceledException) { }
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
new file mode 100644
index 000000000..dc64cb445
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -0,0 +1,143 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEditor.SceneManagement;
+#endif
+using UnityEngine.SceneManagement;
+
+namespace VisualPinball.Unity
+{
+    [CreateAssetMenu(fileName = "Sound Effect", menuName = "Visual Pinball/Sound/Sound Effect Asset", order = 102)]
+    public class SoundEffectAsset : SoundAsset
+    {
+        public override bool Loop => _loop;
+
+        [SerializeField] private Vector2 _volumeRange = new(1f, 1f);
+        [SerializeField] private Vector2 _pitchRange = new(1f, 1f);
+        [SerializeField] private bool _loop;
+        [SerializeField, Range(0, 10f)] private float _fadeInTime;
+        [SerializeField, Range(0, 10f)] private float _fadeOutTime;
+
+        public override void ConfigureAudioSource(AudioSource audioSource, float volume = 1)
+        {
+            base.ConfigureAudioSource(audioSource, volume);
+            audioSource.volume *= UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
+            audioSource.pitch = UnityEngine.Random.Range(_pitchRange.x, _pitchRange.y);
+        }
+
+        public async Task Play(GameObject audioObj, CancellationToken allowFadeOutCt, CancellationToken instantCt, float volume = 1f)
+        {
+            var audioSource = audioObj.AddComponent<AudioSource>();
+
+            try
+            {
+                ConfigureAudioSource(audioSource);
+                audioSource.volume *= volume;
+                audioSource.Play();
+                using var eitherCts = CancellationTokenSource.CreateLinkedTokenSource(allowFadeOutCt, instantCt);
+
+                // Fade in
+                if (_loop && _fadeInTime > 0f)
+                {
+                    try
+                    {
+                        await Fade(audioSource, 0f, audioSource.volume, _fadeInTime, eitherCts.Token);
+                    }
+                    catch (OperationCanceledException) { }
+                }
+                instantCt.ThrowIfCancellationRequested();
+
+                // Play until sound stops or cancellation is requested
+                try
+                {
+                    await WaitUntilAudioStops(audioSource, eitherCts.Token);
+                }
+                catch (OperationCanceledException) { }
+                instantCt.ThrowIfCancellationRequested();
+
+                // Fade out
+                if (audioSource != null && audioSource.isPlaying && _loop && _fadeOutTime > 0f)
+                {
+                    await Fade(audioSource, audioSource.volume, 0f, _fadeOutTime, instantCt);
+                }
+            }
+            finally
+            {
+                if (audioSource != null)
+                {
+                    if (Application.isPlaying)
+                        Destroy(audioSource);
+                    else
+                        DestroyImmediate(audioSource);
+                }
+            }
+        }
+        public static async Task Fade(AudioSource audioSource, float fromVolume, float toVolume, float duration, CancellationToken ct)
+        {
+            float progress = 0f;
+#if UNITY_EDITOR
+            // Time.deltaTime doesn't really work in the editor outside play mode
+            var lastTime = EditorApplication.timeSinceStartup;
+#endif
+            while (progress < 1f)
+            {
+                ct.ThrowIfCancellationRequested();
+                audioSource.volume = Mathf.Lerp(fromVolume, toVolume, progress);
+#if UNITY_EDITOR
+                var deltaTime = (float)(EditorApplication.timeSinceStartup - lastTime);
+                lastTime = EditorApplication.timeSinceStartup;
+#else
+				var deltaTime = Time.deltaTime;
+#endif
+                progress += (1f / duration) * deltaTime;
+                await Task.Yield();
+            }
+        }
+
+#if UNITY_EDITOR
+        public async Task PlayInEditorPreviewScene(CancellationToken allowFadeOutCt, CancellationToken instantCt)
+        {
+            Scene previewScene = EditorSceneManager.NewPreviewScene();
+            try
+            {
+                previewScene.name = "VPE Audio Preview";
+                var audioObj = new GameObject("Audio Preview");
+                SceneManager.MoveGameObjectToScene(audioObj, previewScene);
+                await Play(audioObj, allowFadeOutCt, instantCt);
+            }
+            finally
+            {
+                EditorSceneManager.ClosePreviewScene(previewScene);
+            }
+        }
+#endif
+
+        public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
+        {
+            while (audioSource != null && (audioSource.isPlaying || (Application.isPlaying && !Application.isFocused)))
+            {
+                await Task.Yield();
+                ct.ThrowIfCancellationRequested();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta
new file mode 100644
index 000000000..7664ba0a0
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6e0ad37c5157a844b9026bfcfe140656
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs
index 12c8c83d7..f308ebdbb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs
@@ -31,86 +31,6 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public static class SoundUtils
 	{
-		public static async Task Fade(AudioSource audioSource, float fromVolume, float toVolume, float duration, CancellationToken ct)
-		{
-			float progress = 0f;
-#if UNITY_EDITOR
-			// Time.deltaTime doesn't really work in the editor outside play mode
-			var lastTime = EditorApplication.timeSinceStartup;
-#endif
-			while (progress < 1f) {
-				ct.ThrowIfCancellationRequested();
-				audioSource.volume = Mathf.Lerp(fromVolume, toVolume, progress);
-#if UNITY_EDITOR
-				var deltaTime = (float)(EditorApplication.timeSinceStartup - lastTime);
-				lastTime = EditorApplication.timeSinceStartup;
-#else
-				var deltaTime = Time.deltaTime;
-#endif
-				progress += (1f / duration) * deltaTime;
-				await Task.Yield();
-			}
-		}
-
-#if UNITY_EDITOR
-		public static async Task PlayInEditorPreviewScene(SoundAsset sound, CancellationToken allowFadeOutCt, CancellationToken instantCt)
-		{
-			Scene previewScene = EditorSceneManager.NewPreviewScene();
-			try {
-				previewScene.name = "VPE Audio Preview";
-				var audioObj = new GameObject("Audio Preview");
-				SceneManager.MoveGameObjectToScene(audioObj, previewScene);
-				await Play(sound, audioObj, allowFadeOutCt, instantCt);
-			} finally {
-				EditorSceneManager.ClosePreviewScene(previewScene);
-			}
-		}
-#endif
-
-		public static async Task Play(SoundAsset sound, GameObject audioObj, CancellationToken allowFadeOutCt, CancellationToken instantCt, float volume = 1f)
-		{
-			var audioSource = audioObj.AddComponent<AudioSource>();
-
-			try {
-				sound.ConfigureAudioSource(audioSource);
-				audioSource.volume *= volume;
-				audioSource.Play();
-				using var eitherCts = CancellationTokenSource.CreateLinkedTokenSource(allowFadeOutCt, instantCt);
-
-				// Fade in
-				if (sound.Loop && sound.FadeInTime > 0f) {
-					try {
-						await Fade(audioSource, 0f, audioSource.volume, sound.FadeInTime, eitherCts.Token);
-					} catch (OperationCanceledException) { }
-				}
-				instantCt.ThrowIfCancellationRequested();
-
-				// Play until sound stops or cancellation is requested
-				try {
-					await WaitUntilAudioStops(audioSource, eitherCts.Token);
-				} catch (OperationCanceledException) { }
-				instantCt.ThrowIfCancellationRequested();
-
-				// Fade out
-				if (audioSource.isPlaying && sound.Loop && sound.FadeOutTime > 0f) {
-					await Fade(audioSource, audioSource.volume, 0f, sound.FadeOutTime, instantCt);
-				}
-			} finally {
-				if (audioSource != null) {
-					if (Application.isPlaying)
-						UnityEngine.Object.Destroy(audioSource);
-					else
-						UnityEngine.Object.DestroyImmediate(audioSource);
-				}
-			}
-		}
 
-		public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
-		{
-			while (audioSource != null && (audioSource.isPlaying || (Application.isPlaying && !Application.isFocused))) {
-				await Task.Yield();
-				ct.ThrowIfCancellationRequested();
-			}
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
new file mode 100644
index 000000000..8c3a404be
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
@@ -0,0 +1,33 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+    [CreateAssetMenu(fileName = "Voice Asset", menuName = "Visual Pinball/Sound/Voice Asset", order = 102)]
+
+    public class VoiceAsset : SoundAsset
+    {
+        public override bool Loop => _loop;
+        public SoundPriority Priority => _priority;
+
+        [SerializeField] private SoundPriority _priority;
+        [SerializeField] private bool _loop;
+	}
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta
new file mode 100644
index 000000000..ffdc6989d
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2cfd1a7f71a6fab4a911f6c735c4a8b9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From c9b3efd32abda47da030dd955e86600a50b708fb Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:08:01 +0100
Subject: [PATCH 02/53] Overhaul music playback

---
 .../Sound/MusicAssetInspector.uxml            |   4 +-
 .../Sound/SoundAssetInspector.uxml            |   1 -
 .../Sound/SoundComponentInspector.cs          |  21 +--
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |  20 +--
 .../Sound/MusicCoordinator.cs                 |  70 ++++++++
 .../Sound/MusicCoordinator.cs.meta            |  11 ++
 .../VisualPinball.Unity/Sound/MusicPlayer.cs  | 155 ++++++++++++++----
 .../Sound/MusicPlayer.cs.meta                 |   2 +-
 .../VisualPinball.Unity/Sound/MusicRequest.cs |  37 +++++
 .../Sound/MusicRequest.cs.meta                |  11 ++
 .../VisualPinball.Unity/Sound/SoundAsset.cs   |  17 +-
 .../Sound/SoundEffectAsset.cs                 |   8 +-
 ...ndComponent.cs => SoundEffectComponent.cs} |   7 +-
 ...t.cs.meta => SoundEffectComponent.cs.meta} |   0
 .../VisualPinball.Unity/Sound/VoiceAsset.cs   |   2 -
 15 files changed, 280 insertions(+), 86 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta
 rename VisualPinball.Unity/VisualPinball.Unity/Sound/{SoundComponent.cs => SoundEffectComponent.cs} (94%)
 rename VisualPinball.Unity/VisualPinball.Unity/Sound/{SoundComponent.cs.meta => SoundEffectComponent.cs.meta} (100%)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
index 59abaf6fc..aa984f040 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
@@ -1,6 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" />
     <uie:PropertyField binding-path="_priority" label="Priority" />
-    <uie:PropertyField binding-path="_transitionType" label="Transition Type" />
-    <uie:PropertyField binding-path="_fadeDuration" label="Fade Duration" />
+    <uie:PropertyField binding-path="_volume" label="Volume" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
index f9826150c..f63df3af7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
@@ -1,7 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <Style src="project://database/Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/Common/MultilineTextField.uss?fileID=7433441132597879392&amp;guid=443092b513c6ebc4bbfbfe7de8daa864&amp;type=3#MultilineTextField" />
     <ui:TextField picking-mode="Ignore" label="Description" multiline="true" binding-path="_description" name="description" class="multiline-textfield unity-base-field__aligned" />
-    <uie:PropertyField binding-path="_volume" label="Volume" name="volume" />
     <uie:PropertyField name="clips" binding-path="_clips" label="Clips" />
     <uie:PropertyField name="clip-selection-method" binding-path="_clipSelectionMethod" label="Clip Selection Method" />
     <uie:PropertyField name="is-spatial" binding-path="_isSpatial" label="Is Spatial" />
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index 99e03495e..e5daa6f4a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -24,7 +24,7 @@
 
 namespace VisualPinball.Unity.Editor
 {
-	[CustomEditor(typeof(SoundComponent), editorForChildClasses: true), CanEditMultipleObjects]
+	[CustomEditor(typeof(SoundEffectComponent), editorForChildClasses: true), CanEditMultipleObjects]
 	public class SoundComponentInspector : UnityEditor.Editor
 	{
 		public override VisualElement CreateInspectorGUI()
@@ -66,8 +66,9 @@ void UpdateVisibility(SerializedProperty prop)
 
 		protected void MissingComponentHelpBox(VisualElement container)
 		{
-			if (target != null && target is SoundComponent) {
-				var soundComp = target as SoundComponent;
+			if (target != null &&
+				target is SoundEffectComponent) {
+				var soundComp = target as SoundEffectComponent;
 				var requiredType = soundComp.GetRequiredType();
 				if (requiredType != null && !soundComp.TryGetComponent(requiredType, out _)) {
 					container.Add(new HelpBox($"This component needs a component of type {requiredType.Name} on the same game object to work.",
@@ -81,13 +82,9 @@ private bool AllTargetsSupportLoopingSoundAssets()
 			foreach (var t in targets) {
 				if (t == null) {
 					continue;
-				}
-
-				if (t is not SoundComponent) {
+				if (target is not SoundEffectComponent)
 					continue;
-				}
-
-				if (!(t as SoundComponent).SupportsLoopingSoundAssets()) {
+				if (!(target as SoundEffectComponent).SupportsLoopingSoundAssets())
 					return false;
 				}
 			}
@@ -106,9 +103,9 @@ protected void InfiniteLoopHelpBox(VisualElement container)
 
 			void UpdateVisbility(SerializedObject obj)
 			{
-				var prop = obj.FindProperty(nameof(SoundComponent._soundAsset));
-				var soundAsset = prop.objectReferenceValue as SoundAsset;
-				if (soundAsset && soundAsset.Loop && !AllTargetsSupportLoopingSoundAssets()) {
+				var soundAssetProp = obj.FindProperty("_soundAsset");
+				var soundAsset = soundAssetProp.objectReferenceValue as SoundEffectAsset;
+				if (soundAsset && soundAsset.Loop && !AllTargetsSupportLoopingSoundAssets())
 					helpBox.style.display = DisplayStyle.Flex;
 				} else {
 					helpBox.style.display = DisplayStyle.None;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 1d6369c8b..05df4cffe 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -15,31 +15,17 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace VisualPinball.Unity
 {
-
     [CreateAssetMenu(fileName = "Music Asset", menuName = "Visual Pinball/Sound/Music Asset", order = 102)]
     public class MusicAsset : SoundAsset
     {
-        private enum PlaybackState
-        {
-            Waiting,
-            FadingIn,
-            Playing,
-            FadingOut
-        }
-
-        public override bool Loop => _loop;
         public SoundPriority Priority => _priority;
+        public float Volume => _volume;
 
-        [SerializeField] private SoundPriority _priority;
-        [SerializeField] private bool _loop;
-        [SerializeField] private MusicTransitionType _transitionType;
-        [SerializeField][Range(0f, 10f)] private float _fadeDuration;
+        [SerializeField] private SoundPriority _priority = SoundPriority.Medium;
+        [SerializeField][Range(0f, 1f)] private float _volume;
     }
 }
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
new file mode 100644
index 000000000..0a1d380c1
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -0,0 +1,70 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+    public class MusicCoordinator : MonoBehaviour
+    {
+        [SerializeField][Range(0f, 10f)] private float _fadeDuration = 3f;
+
+        private readonly List<MusicPlayer> _playerStack = new();
+
+        public void AddRequest(MusicAsset musicAsset)
+        {
+            var player = _playerStack.FirstOrDefault(x => x.MusicAsset == musicAsset);
+            if (player == null)
+            {
+                player = gameObject.AddComponent<MusicPlayer>();
+                player.Init(musicAsset, _fadeDuration);
+                _playerStack.Add(player);
+            }
+            player.AddRequest();
+
+            OnStackChanged();
+        }
+
+        public void RemoveRequest(MusicAsset musicAsset)
+        {
+            var player = _playerStack.FirstOrDefault(x => x.MusicAsset == musicAsset);
+            if (player != default)
+            {
+                player.RemoveRequest();
+                OnStackChanged();
+            }
+        }
+
+        private void OnStackChanged()
+        {
+            _playerStack.RemoveAll(x => x == null);
+
+            if (_playerStack.Any(x => x.ActiveRequestCount > 0))
+            {
+                _playerStack.Sort();
+                _playerStack[0].ShouldPlay = true;
+                // No need to fade in if nothing else is playing
+                _playerStack[0].StartAtFullVolume = !_playerStack.Any(x => x.IsPlaying);
+                for (int i = 1; i < _playerStack.Count; i++)
+                    _playerStack[i].ShouldPlay = false;
+            }
+            else
+                _playerStack.ForEach(x => x.ShouldPlay = false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta
new file mode 100644
index 000000000..784e8214a
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 24ce1835440b2a54f9c0886a734eb8f4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index c18cd17e7..4810ca249 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -14,56 +14,153 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System.Collections.Generic;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 using UnityEngine;
 
 namespace VisualPinball.Unity
 {
-    public enum MusicTransitionType
+    public class MusicPlayer : MonoBehaviour, IComparable<MusicPlayer>
     {
-        CrossFade,
-        FadeOut,
-    }
+        public bool ShouldPlay { get; set; }
+        public bool IsPlaying => _audioSource != null && _audioSource.isPlaying;
 
-    public class MusicPlayer : MonoBehaviour
-    {
-        [SerializeField] private MusicTransitionType _transitionType;
+        public MusicAsset MusicAsset { get; private set; }
+        public float FadeDuration { get; set; }
+        public bool StartAtFullVolume { get; set; }
+        public int ActiveRequestCount => _activeRequestCount;
 
-        private readonly List<StackItem> _musicStack = new();
-        private int _stackCounter = 0;
+        private AudioSource _audioSource;
+        // The number of times this music asset was requested to be added to the player stack.
+        // We don't literally add it multiple times to avoid cross-fading the same track into itself.
+        private int _activeRequestCount;
+        private DateTime _lastRequestTime;
 
-        public void InsertIntoStack(MusicAsset music, out int stackId)
+        public void Init(MusicAsset musicAsset, float fadeDuration)
         {
-            stackId = _stackCounter;
-            _stackCounter++;
-            var stackItem = new StackItem(music, stackId);
-            var index = _musicStack.FindIndex(x => x.MusicAsset.Priority <= stackItem.MusicAsset.Priority);
+            MusicAsset = musicAsset;
+            FadeDuration = fadeDuration;
+        }
 
-            if (index == -1)
-                _musicStack.Insert(index, stackItem);
-            else
-                _musicStack.Add(stackItem);
+        public void AddRequest()
+        {
+            _activeRequestCount++;
+            _lastRequestTime = DateTime.Now;
+        }
 
+        public void RemoveRequest()
+        {
+            if (_activeRequestCount > 0)
+                _activeRequestCount--;
+        }
 
+        private void Start()
+        {
+            _audioSource = gameObject.AddComponent<AudioSource>();
+            _audioSource.volume = 0f;
         }
 
-        public void RemoveFromStack(int stackId)
+        private void Update()
         {
-            var index = _musicStack.FindIndex(x => x.StackId == stackId);
-            if (index >= 0)
-                _musicStack.RemoveAt(index);
+            var canPlay = _audioSource.isActiveAndEnabled;
+#if UNITY_EDITOR
+            canPlay &= EditorApplication.isFocused;
+#else
+            canPlay &= Application.isFocused;
+#endif
+            if (ShouldPlay && canPlay && !_audioSource.isPlaying)
+            {
+                var oldVolume = _audioSource.volume;
+                MusicAsset.ConfigureAudioSource(_audioSource);
+                _audioSource.Play();
+                _audioSource.volume = StartAtFullVolume ? MusicAsset.Volume : oldVolume;
+            }
+            else if (!ShouldPlay && _audioSource.isPlaying && _audioSource.volume == 0f)
+            {
+                _audioSource.Stop();
+            }
+
+            var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
+            if (_audioSource.volume != targetVolume)
+            {
+                if (FadeDuration == 0f)
+                {
+                    _audioSource.volume = targetVolume;
+                }
+                else
+                {
+                    if (_audioSource.volume < targetVolume)
+                        _audioSource.volume += 1 / FadeDuration * Time.deltaTime;
+                    else
+                        _audioSource.volume -= 1 / FadeDuration * Time.deltaTime;
+                    _audioSource.volume = Mathf.Clamp(_audioSource.volume, 0f, MusicAsset.Volume);
+                }
+            }
         }
 
-        private readonly struct StackItem
+        private async Task Play(CancellationToken ct)
         {
-            public readonly MusicAsset MusicAsset;
-            public readonly int StackId;
+            ct.ThrowIfCancellationRequested();
+            MusicAsset.ConfigureAudioSource(_audioSource);
+            _audioSource.Play();
+            try
+            {
+                _audioSource.volume = StartAtFullVolume ? MusicAsset.Volume : 0f;
 
-            public StackItem(MusicAsset musicAsset, int stackid)
+                while (true)
+                {
+                    while (_audioSource.isPlaying)
+                    {
+                        var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
+                        if (_audioSource.volume != targetVolume)
+                        {
+                            if (FadeDuration == 0f)
+                            {
+                                _audioSource.volume = targetVolume;
+                            }
+                            else
+                            {
+                                if (_audioSource.volume < targetVolume)
+                                    _audioSource.volume += 1 / FadeDuration * Time.deltaTime;
+                                else
+                                    _audioSource.volume -= 1 / FadeDuration * Time.deltaTime;
+                                _audioSource.volume = Mathf.Clamp(_audioSource.volume, 0f, MusicAsset.Volume);
+                            }
+                        }
+                        await Task.Yield();
+                        ct.ThrowIfCancellationRequested();
+                    }
+                    MusicAsset.ConfigureAudioSource(_audioSource);
+                    _audioSource.Play();
+                }
+            }
+            finally
             {
-                MusicAsset = musicAsset;
-                StackId = stackid;
+                _audioSource.Stop();
             }
         }
+
+        private void OnDestroy()
+        {
+            if (_audioSource != null)
+                Destroy(_audioSource);
+        }
+
+        // Used to sort the music player stack and determine which player should play
+        public int CompareTo(MusicPlayer other)
+        {
+            if (_activeRequestCount > 0 && other._activeRequestCount == 0) return -1;
+            if (_activeRequestCount == 0 && other._activeRequestCount > 0) return 1;
+            if (MusicAsset.Priority != other.MusicAsset.Priority)
+                return other.MusicAsset.Priority.CompareTo(MusicAsset.Priority);
+            if (_lastRequestTime != null)
+                return _lastRequestTime.CompareTo(other._lastRequestTime);
+            return 0;
+        }
     }
 }
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
index 784e8214a..b3d8b947f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 24ce1835440b2a54f9c0886a734eb8f4
+guid: 94ff9bae4534d3341a33ee4a9127d64a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
new file mode 100644
index 000000000..59fc1a583
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -0,0 +1,37 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+    public class MusicRequest : MonoBehaviour
+    {
+        [SerializeField] private MusicCoordinator coordinator;
+        [SerializeField] private MusicAsset musicAsset;
+        [SerializeField] private SoundPriority _priority = SoundPriority.Medium;
+
+        private void OnEnable()
+        {
+            coordinator.AddRequest(musicAsset);
+        }
+
+        private void OnDisable()
+        {
+            coordinator.RemoveRequest(musicAsset);
+        }
+    }
+}
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta
new file mode 100644
index 000000000..7fab37218
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6a3f0b8ca7954c04baffe0e10ea16eef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index 94b9e38c0..777803e50 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -1,4 +1,4 @@
-// Visual Pinball Engine
+// Visual Pinball Engine
 // Copyright (C) 2023 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,15 +18,8 @@
 
 using System;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-#if UNITY_EDITOR
-using UnityEditor;
-using UnityEditor.SceneManagement;
-#endif
 using UnityEngine;
 using UnityEngine.Audio;
-using UnityEngine.SceneManagement;
 using Random = UnityEngine.Random;
 
 namespace VisualPinball.Unity
@@ -54,8 +47,6 @@ private enum SelectionMethod
 			Random
 		}
 
-		public virtual bool Loop => false;
-
 		[SerializeField] private string _description;
 		[SerializeField] private AudioClip[] _clips;
 		[SerializeField] private SelectionMethod _clipSelectionMethod;
@@ -63,14 +54,14 @@ private enum SelectionMethod
 		[SerializeField] private bool _isSpatial = true;
 		[SerializeField] private AudioMixerGroup _audioMixerGroup;
 
-		private int _roundRobinIndex = 0;
+		[NonSerialized] private int _roundRobinIndex = 0;
 
-		public virtual void ConfigureAudioSource(AudioSource audioSource, float volume = 1)
+		public virtual void ConfigureAudioSource(AudioSource audioSource)
 		{
-			audioSource.volume = volume;
 			audioSource.clip = GetClip();
 			audioSource.spatialBlend = _isSpatial ? 0f : 1f;
 			audioSource.outputAudioMixerGroup = _audioMixerGroup;
+			audioSource.playOnAwake = false;
 		}
 
 		public bool IsValid()
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index dc64cb445..dccd2a47b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -29,7 +29,7 @@ namespace VisualPinball.Unity
     [CreateAssetMenu(fileName = "Sound Effect", menuName = "Visual Pinball/Sound/Sound Effect Asset", order = 102)]
     public class SoundEffectAsset : SoundAsset
     {
-        public override bool Loop => _loop;
+        public bool Loop => _loop;
 
         [SerializeField] private Vector2 _volumeRange = new(1f, 1f);
         [SerializeField] private Vector2 _pitchRange = new(1f, 1f);
@@ -37,10 +37,10 @@ public class SoundEffectAsset : SoundAsset
         [SerializeField, Range(0, 10f)] private float _fadeInTime;
         [SerializeField, Range(0, 10f)] private float _fadeOutTime;
 
-        public override void ConfigureAudioSource(AudioSource audioSource, float volume = 1)
+        public override void ConfigureAudioSource(AudioSource audioSource)
         {
-            base.ConfigureAudioSource(audioSource, volume);
-            audioSource.volume *= UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
+            base.ConfigureAudioSource(audioSource);
+            audioSource.volume = UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
             audioSource.pitch = UnityEngine.Random.Range(_pitchRange.x, _pitchRange.y);
         }
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
similarity index 94%
rename from VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
rename to VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
index 3976fc344..42277adcf 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
@@ -29,7 +29,7 @@ namespace VisualPinball.Unity
 	/// Base component for playing a <c>SoundAsset</c> using the public methods <c>Play</c> and <c>Stop</c>.
 	/// </summary>
 	[AddComponentMenu("Visual Pinball/Sound/Sound")]
-	public class SoundComponent : EnableAfterAwakeComponent
+	public class SoundEffectComponent : EnableAfterAwakeComponent
 	{
 		[SerializeReference]
 		protected SoundEffectAsset _soundAsset;
@@ -61,7 +61,7 @@ protected virtual void OnDisable()
 			_instantCts = null;
 		}
 
-		public async Task Play(float volume = 1f)
+		public async Task Play()
 		{
 			if (!isActiveAndEnabled) {
 				Logger.Warn("Cannot play a disabled sound component.");
@@ -83,9 +83,8 @@ public async Task Play(float volume = 1f)
 				Stop(allowFade: true);
 			}
 			try {
-				var combinedVol = _volume * volume;
 				_lastPlayStartTime = Time.unscaledTime;
-				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, combinedVol);
+				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
 			} catch (OperationCanceledException) { }
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
index 8c3a404be..77c55fae9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
@@ -24,10 +24,8 @@ namespace VisualPinball.Unity
 
     public class VoiceAsset : SoundAsset
     {
-        public override bool Loop => _loop;
         public SoundPriority Priority => _priority;
 
         [SerializeField] private SoundPriority _priority;
-        [SerializeField] private bool _loop;
 	}
 }
\ No newline at end of file

From 17fa2a49ce5294d25aaa263431c75328dbd00bb0 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:25:17 +0100
Subject: [PATCH 03/53] Separate musc request from player

---
 .../Sound/MusicAssetInspector.uxml            |   1 -
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |   2 -
 .../Sound/MusicCoordinator.cs                 | 101 +++++++++++++-----
 .../VisualPinball.Unity/Sound/MusicPlayer.cs  |  90 ++--------------
 .../VisualPinball.Unity/Sound/MusicRequest.cs |   6 +-
 5 files changed, 87 insertions(+), 113 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
index aa984f040..76fa0e858 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.uxml
@@ -1,4 +1,3 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:PropertyField binding-path="_priority" label="Priority" />
     <uie:PropertyField binding-path="_volume" label="Volume" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 05df4cffe..51280d778 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -22,10 +22,8 @@ namespace VisualPinball.Unity
     [CreateAssetMenu(fileName = "Music Asset", menuName = "Visual Pinball/Sound/Music Asset", order = 102)]
     public class MusicAsset : SoundAsset
     {
-        public SoundPriority Priority => _priority;
         public float Volume => _volume;
 
-        [SerializeField] private SoundPriority _priority = SoundPriority.Medium;
         [SerializeField][Range(0f, 1f)] private float _volume;
     }
 }
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index 0a1d380c1..65b438bd2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -14,57 +14,104 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using NLog;
 using UnityEngine;
+using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
 {
     public class MusicCoordinator : MonoBehaviour
     {
+        [Tooltip("How many seconds should transitions between songs take?")]
         [SerializeField][Range(0f, 10f)] private float _fadeDuration = 3f;
 
-        private readonly List<MusicPlayer> _playerStack = new();
+        private readonly List<MusicPlayer> _players = new();
+        private readonly List<MusicRequest> _requestStack = new();
+        private int _requestCounter;
 
-        public void AddRequest(MusicAsset musicAsset)
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Insert a request into the request stack
+        /// </summary>
+        /// <param name="musicAsset">The requested music</param>
+        /// <param name="requestId">A unique identifier that can be used to remove the request later</param>
+        /// <param name="priority">The priority of the request</param>
+        public void AddRequest(MusicAsset musicAsset, out int requestId, SoundPriority priority = SoundPriority.Medium)
         {
-            var player = _playerStack.FirstOrDefault(x => x.MusicAsset == musicAsset);
-            if (player == null)
-            {
-                player = gameObject.AddComponent<MusicPlayer>();
-                player.Init(musicAsset, _fadeDuration);
-                _playerStack.Add(player);
-            }
-            player.AddRequest();
+            var request = new MusicRequest(musicAsset, _requestCounter, priority);
+            requestId = request.Id;
+            _requestCounter++;
+            _requestStack.Add(request);
+
+            EvaluateRequestStack();
+        }
 
-            OnStackChanged();
+        /// <summary>
+        /// Remove a request that was previously added using <c>AddRequest</c>
+        /// </summary>
+        /// <param name="requestId"></param>
+        public void RemoveRequest(int requestId)
+        {
+            var i = _requestStack.FindIndex(x => x.Id == requestId);
+            if (i != -1)
+                _requestStack.RemoveAt(i);
+            else
+                Logger.Error(
+                    $"Can't remove music request with id '{requestId}' because there is no such "
+                    + "request in the stack.");
+            EvaluateRequestStack();
         }
 
-        public void RemoveRequest(MusicAsset musicAsset)
+        private void EvaluateRequestStack()
         {
-            var player = _playerStack.FirstOrDefault(x => x.MusicAsset == musicAsset);
-            if (player != default)
+            _players.RemoveAll(x => x == null);
+            if (_requestStack.Count > 0)
             {
-                player.RemoveRequest();
-                OnStackChanged();
+                _requestStack.Sort();
+                var musicToPlay = _requestStack[0].MusicAsset;
+                var playerToPlay = _players.FirstOrDefault(x => x.MusicAsset == musicToPlay);
+                if (playerToPlay == default)
+                {
+                    playerToPlay = gameObject.AddComponent<MusicPlayer>();
+                    playerToPlay.Init(musicToPlay, _fadeDuration);
+                    _players.Add(playerToPlay);
+                }
+
+                // No need to fade in if nothing else is playing
+                playerToPlay.StartAtFullVolume = !_players.Any(x => x.IsPlaying);
+                _players.ForEach(x => x.ShouldPlay = x == playerToPlay);
             }
+            else
+                _players.ForEach(x => x.ShouldPlay = false);
         }
 
-        private void OnStackChanged()
+        private readonly struct MusicRequest : IComparable<MusicRequest>
         {
-            _playerStack.RemoveAll(x => x == null);
+            public MusicRequest(MusicAsset musicAsset, int id, SoundPriority priority = SoundPriority.Medium)
+            {
+                MusicAsset = musicAsset;
+                Priority = priority;
+                Time = DateTime.Now;
+                Id = id;
+            }
 
-            if (_playerStack.Any(x => x.ActiveRequestCount > 0))
+            public readonly MusicAsset MusicAsset;
+            public readonly SoundPriority Priority;
+            public readonly DateTime Time;
+            public readonly int Id;
+
+            // Used to sort the request stack to determine which request to play
+            public int CompareTo(MusicRequest other)
             {
-                _playerStack.Sort();
-                _playerStack[0].ShouldPlay = true;
-                // No need to fade in if nothing else is playing
-                _playerStack[0].StartAtFullVolume = !_playerStack.Any(x => x.IsPlaying);
-                for (int i = 1; i < _playerStack.Count; i++)
-                    _playerStack[i].ShouldPlay = false;
+                if (Priority != other.Priority)
+                    return other.Priority.CompareTo(Priority);
+                // If priority is the same, favor newer requests
+                return other.Time.CompareTo(Time);
             }
-            else
-                _playerStack.ForEach(x => x.ShouldPlay = false);
         }
     }
 }
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index 4810ca249..98936c2e9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -15,8 +15,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -25,38 +25,20 @@
 
 namespace VisualPinball.Unity
 {
-    public class MusicPlayer : MonoBehaviour, IComparable<MusicPlayer>
+    public class MusicPlayer : MonoBehaviour
     {
         public bool ShouldPlay { get; set; }
         public bool IsPlaying => _audioSource != null && _audioSource.isPlaying;
-
-        public MusicAsset MusicAsset { get; private set; }
-        public float FadeDuration { get; set; }
         public bool StartAtFullVolume { get; set; }
-        public int ActiveRequestCount => _activeRequestCount;
+        public MusicAsset MusicAsset { get; private set; }
 
         private AudioSource _audioSource;
-        // The number of times this music asset was requested to be added to the player stack.
-        // We don't literally add it multiple times to avoid cross-fading the same track into itself.
-        private int _activeRequestCount;
-        private DateTime _lastRequestTime;
+        private float _fadeDuration;
 
         public void Init(MusicAsset musicAsset, float fadeDuration)
         {
             MusicAsset = musicAsset;
-            FadeDuration = fadeDuration;
-        }
-
-        public void AddRequest()
-        {
-            _activeRequestCount++;
-            _lastRequestTime = DateTime.Now;
-        }
-
-        public void RemoveRequest()
-        {
-            if (_activeRequestCount > 0)
-                _activeRequestCount--;
+            _fadeDuration = fadeDuration;
         }
 
         private void Start()
@@ -88,79 +70,25 @@ private void Update()
             var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
             if (_audioSource.volume != targetVolume)
             {
-                if (FadeDuration == 0f)
+                if (_fadeDuration == 0f)
                 {
                     _audioSource.volume = targetVolume;
                 }
                 else
                 {
                     if (_audioSource.volume < targetVolume)
-                        _audioSource.volume += 1 / FadeDuration * Time.deltaTime;
+                        _audioSource.volume += 1 / _fadeDuration * Time.deltaTime;
                     else
-                        _audioSource.volume -= 1 / FadeDuration * Time.deltaTime;
+                        _audioSource.volume -= 1 / _fadeDuration * Time.deltaTime;
                     _audioSource.volume = Mathf.Clamp(_audioSource.volume, 0f, MusicAsset.Volume);
                 }
             }
         }
 
-        private async Task Play(CancellationToken ct)
-        {
-            ct.ThrowIfCancellationRequested();
-            MusicAsset.ConfigureAudioSource(_audioSource);
-            _audioSource.Play();
-            try
-            {
-                _audioSource.volume = StartAtFullVolume ? MusicAsset.Volume : 0f;
-
-                while (true)
-                {
-                    while (_audioSource.isPlaying)
-                    {
-                        var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
-                        if (_audioSource.volume != targetVolume)
-                        {
-                            if (FadeDuration == 0f)
-                            {
-                                _audioSource.volume = targetVolume;
-                            }
-                            else
-                            {
-                                if (_audioSource.volume < targetVolume)
-                                    _audioSource.volume += 1 / FadeDuration * Time.deltaTime;
-                                else
-                                    _audioSource.volume -= 1 / FadeDuration * Time.deltaTime;
-                                _audioSource.volume = Mathf.Clamp(_audioSource.volume, 0f, MusicAsset.Volume);
-                            }
-                        }
-                        await Task.Yield();
-                        ct.ThrowIfCancellationRequested();
-                    }
-                    MusicAsset.ConfigureAudioSource(_audioSource);
-                    _audioSource.Play();
-                }
-            }
-            finally
-            {
-                _audioSource.Stop();
-            }
-        }
-
         private void OnDestroy()
         {
             if (_audioSource != null)
                 Destroy(_audioSource);
         }
-
-        // Used to sort the music player stack and determine which player should play
-        public int CompareTo(MusicPlayer other)
-        {
-            if (_activeRequestCount > 0 && other._activeRequestCount == 0) return -1;
-            if (_activeRequestCount == 0 && other._activeRequestCount > 0) return 1;
-            if (MusicAsset.Priority != other.MusicAsset.Priority)
-                return other.MusicAsset.Priority.CompareTo(MusicAsset.Priority);
-            if (_lastRequestTime != null)
-                return _lastRequestTime.CompareTo(other._lastRequestTime);
-            return 0;
-        }
     }
 }
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index 59fc1a583..e5a1cd574 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -24,14 +24,16 @@ public class MusicRequest : MonoBehaviour
         [SerializeField] private MusicAsset musicAsset;
         [SerializeField] private SoundPriority _priority = SoundPriority.Medium;
 
+        private int requestId;
+
         private void OnEnable()
         {
-            coordinator.AddRequest(musicAsset);
+            coordinator.AddRequest(musicAsset, out requestId, _priority);
         }
 
         private void OnDisable()
         {
-            coordinator.RemoveRequest(musicAsset);
+            coordinator.RemoveRequest(requestId);
         }
     }
 }
\ No newline at end of file

From e3793152e955fc23a576ea1c6cd01166730e52f2 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:26:55 +0100
Subject: [PATCH 04/53] Format code

---
 .../Sound/MusicAssetInspector.cs              |  25 +-
 .../Sound/SoundAssetInspector.cs              |  70 +++--
 .../Sound/SoundComponentInspector.cs          |  57 ++--
 .../Sound/SoundEffectAssetInspector.cs        |  32 +--
 .../Sound/SwitchSoundComponentInspector.cs    |  10 +-
 .../Sound/VoiceAssetInspector.cs              |  28 +-
 .../Sound/BinaryEventSoundComponent.cs        |  24 +-
 .../Sound/CoilSoundComponent.cs               |   2 +-
 .../Sound/EventSoundComponent.cs              |   3 +-
 .../Sound/HitSoundComponent.cs                |   1 +
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |  20 +-
 .../Sound/MusicCoordinator.cs                 | 175 ++++++------
 .../VisualPinball.Unity/Sound/MusicPlayer.cs  | 121 +++++----
 .../VisualPinball.Unity/Sound/MusicRequest.cs |  37 +--
 .../VisualPinball.Unity/Sound/SoundAsset.cs   | 212 ++++++++-------
 .../Sound/SoundEffectAsset.cs                 | 253 ++++++++++--------
 .../Sound/SoundEffectComponent.cs             |  39 +--
 .../VisualPinball.Unity/Sound/SoundUtils.cs   |  36 ---
 .../Sound/SoundUtils.cs.meta                  |  11 -
 .../Sound/SwitchSoundComponent.cs             |  10 +-
 .../VisualPinball.Unity/Sound/VoiceAsset.cs   |  20 +-
 21 files changed, 631 insertions(+), 555 deletions(-)
 delete mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs
 delete mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
index 0cf7193ac..fbc28d9a2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
@@ -15,24 +15,25 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using UnityEditor;
-using UnityEngine.UIElements;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
 {
-    [CustomEditor(typeof(MusicAsset)), CanEditMultipleObjects]
-    public class MusicAssetInspector : SoundAssetInspector
-    {
-        [SerializeField] private VisualTreeAsset _musicAssetInspectorAsset;
+	[CustomEditor(typeof(MusicAsset)), CanEditMultipleObjects]
+	public class MusicAssetInspector : SoundAssetInspector
+	{
+		[SerializeField]
+		private VisualTreeAsset _musicAssetInspectorAsset;
 
 		public override VisualElement CreateInspectorGUI()
 		{
-            var root = new VisualElement();
+			var root = new VisualElement();
 			var baseUi = base.CreateInspectorGUI();
-            root.Add(baseUi);
-            var subUi = _musicAssetInspectorAsset.Instantiate();
-            root.Add(subUi);
-            return root;
+			root.Add(baseUi);
+			var subUi = _musicAssetInspectorAsset.Instantiate();
+			root.Add(subUi);
+			return root;
 		}
-    }
-}
\ No newline at end of file
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
index a5cb9ad76..282f95c20 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
@@ -1,36 +1,34 @@
-// Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-using System.Threading;
-using UnityEditor;
-using UnityEngine.UIElements;
-using UnityEngine;
-
-namespace VisualPinball.Unity.Editor
-{
-	[CustomEditor(typeof(SoundAsset)), CanEditMultipleObjects]
-	public class SoundAssetInspector : UnityEditor.Editor
-	{
-		[SerializeField]
-		private VisualTreeAsset _soundAssetInspectorAsset;
-		
-		public override VisualElement CreateInspectorGUI()
-		{
-			return _soundAssetInspectorAsset.Instantiate();
-		}
-	}
-}
-
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomEditor(typeof(SoundAsset)), CanEditMultipleObjects]
+	public class SoundAssetInspector : UnityEditor.Editor
+	{
+		[SerializeField]
+		private VisualTreeAsset _soundAssetInspectorAsset;
+
+		public override VisualElement CreateInspectorGUI()
+		{
+			return _soundAssetInspectorAsset.Instantiate();
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index e5daa6f4a..ad516f75b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -16,15 +16,18 @@
 
 // ReSharper disable InconsistentNaming
 
-using UnityEditor;
-using UnityEngine.UIElements;
-using UnityEditor.UIElements;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
 {
-	[CustomEditor(typeof(SoundEffectComponent), editorForChildClasses: true), CanEditMultipleObjects]
+	[
+		CustomEditor(typeof(SoundEffectComponent), editorForChildClasses: true),
+		CanEditMultipleObjects
+	]
 	public class SoundComponentInspector : UnityEditor.Editor
 	{
 		public override VisualElement CreateInspectorGUI()
@@ -46,7 +49,8 @@ protected void InvalidSoundAssetHelpBox(VisualElement container)
 		{
 			var helpBox = new HelpBox(
 				"The selected sound asset is invalid. Make sure it has at least one audio clip.",
-				HelpBoxMessageType.Warning);
+				HelpBoxMessageType.Warning
+			);
 			container.Add(helpBox);
 			var soundAssetProp = serializedObject.FindProperty(nameof(SoundComponent._soundAsset));
 			UpdateVisibility(soundAssetProp);
@@ -66,21 +70,26 @@ void UpdateVisibility(SerializedProperty prop)
 
 		protected void MissingComponentHelpBox(VisualElement container)
 		{
-			if (target != null &&
-				target is SoundEffectComponent) {
+			if (target != null && target is SoundEffectComponent)
+			{
 				var soundComp = target as SoundEffectComponent;
 				var requiredType = soundComp.GetRequiredType();
-				if (requiredType != null && !soundComp.TryGetComponent(requiredType, out _)) {
-					container.Add(new HelpBox($"This component needs a component of type {requiredType.Name} on the same game object to work.",
-						HelpBoxMessageType.Error));
-				}
+				if (requiredType != null && !soundComp.TryGetComponent(requiredType, out var _))
+					container.Add(
+						new HelpBox(
+							$"This component needs a component of type "
+								+ $"{requiredType.Name} on the same game object to work.",
+							HelpBoxMessageType.Error
+						)
+					);
 			}
 		}
 
 		private bool AllTargetsSupportLoopingSoundAssets()
 		{
-			foreach (var t in targets) {
-				if (t == null) {
+			foreach (var target in targets)
+			{
+				if (target == null)
 					continue;
 				if (target is not SoundEffectComponent)
 					continue;
@@ -93,10 +102,14 @@ private bool AllTargetsSupportLoopingSoundAssets()
 
 		protected void InfiniteLoopHelpBox(VisualElement container)
 		{
-			var helpBox = new HelpBox("The assigned sound asset loops, but this component " +
-				"provides no mechanism to stop it or is not configured to do so. Either assign" +
-				" a sound asset that does not loop or (if possible) configure this component to" +
-				" stop the sound.", HelpBoxMessageType.Warning);
+			var soundAssetProp = serializedObject.FindProperty("_soundAsset");
+			var helpBox = new HelpBox(
+				"The assigned sound asset loops, but this component "
+					+ "provides no mechanism to stop it or is not configured to do so. Either assign"
+					+ " a sound asset that does not loop or (if possible) configure this component to"
+					+ " stop the sound.",
+				HelpBoxMessageType.Warning
+			);
 			container.Add(helpBox);
 			UpdateVisbility(serializedObject);
 			helpBox.TrackSerializedObjectValue(serializedObject, UpdateVisbility);
@@ -113,7 +126,11 @@ void UpdateVisbility(SerializedObject obj)
 			}
 		}
 
-		protected static void ConfigureDropdown(DropdownField dropdown, SerializedProperty boundProp, Dictionary<string, string> idsToDisplayNames)
+		protected static void ConfigureDropdown(
+			DropdownField dropdown,
+			SerializedProperty boundProp,
+			Dictionary<string, string> idsToDisplayNames
+		)
 		{
 			var displayNamesToIds = idsToDisplayNames.ToDictionary(i => i.Value, i => i.Key);
 			dropdown.choices = displayNamesToIds.Keys.ToList();
@@ -133,8 +150,8 @@ void UpdateDropdown(SerializedProperty property)
 				var id = property.stringValue;
 				if (idsToDisplayNames.TryGetValue(id, out var displayName)) {
 					dropdown.value = displayName;
-
-				} else if (string.IsNullOrEmpty(id) && idsToDisplayNames.Count > 0) {
+				else if (string.IsNullOrEmpty(id) && idsToDisplayNames.Count > 0)
+				{
 					dropdown.value = idsToDisplayNames.First().Value;
 					property.stringValue = idsToDisplayNames.First().Key;
 					property.serializedObject.ApplyModifiedPropertiesWithoutUndo();
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
index ddb4a5266..c2bb7f74a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
@@ -16,30 +16,31 @@
 
 using System;
 using System.Threading;
+using Mono.Cecil.Cil;
 using UnityEditor;
-using UnityEngine.UIElements;
 using UnityEngine;
-using Mono.Cecil.Cil;
+using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
 {
-    [CustomEditor(typeof(SoundEffectAsset)), CanEditMultipleObjects]
-    public class SoundEffectAssetInspector : SoundAssetInspector
-    {
-        [SerializeField] private VisualTreeAsset _soundEffectAssetInspectorAsset;
+	[CustomEditor(typeof(SoundEffectAsset)), CanEditMultipleObjects]
+	public class SoundEffectAssetInspector : SoundAssetInspector
+	{
+		[SerializeField]
+		private VisualTreeAsset _soundEffectAssetInspectorAsset;
 
-        private CancellationTokenSource _allowFadeCts;
+		private CancellationTokenSource _allowFadeCts;
 		private CancellationTokenSource _instantCts;
-        private Button _playButton;
+		private Button _playButton;
 
 		public override VisualElement CreateInspectorGUI()
 		{
-            var root = new VisualElement();
+			var root = new VisualElement();
 			var baseUi = base.CreateInspectorGUI();
-            root.Add(baseUi);
-            var subUi = _soundEffectAssetInspectorAsset.Instantiate();
-            root.Add(subUi);
-            return root;
+			root.Add(baseUi);
+			var subUi = _soundEffectAssetInspectorAsset.Instantiate();
+			root.Add(subUi);
+			return root;
 		}
 
 		private void OnEnable()
@@ -92,5 +93,6 @@ private void OnStopForrealButtonClicked()
 			_instantCts.Cancel();
 			_instantCts.Dispose();
 			_instantCts = new();
-		}    }
-}
\ No newline at end of file
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
index 25aa7cc48..599a2cb89 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
@@ -42,8 +42,14 @@ public override VisualElement CreateInspectorGUI()
 
 		private Dictionary<string, string> GetAvailableSwitches()
 		{
-			var targetComponent = target as Component;
-			if (targetComponent != null && targetComponent.TryGetComponent<ISwitchDeviceComponent>(out var switchDevice)) {
+			if (
+				target != null
+				&& target is Component
+				&& (target as Component).TryGetComponent<ISwitchDeviceComponent>(
+					out var switchDevice
+				)
+			)
+			{
 				return switchDevice.AvailableSwitches.ToDictionary(
 					i => i.Id,
 					i => string.IsNullOrWhiteSpace(i.Description) ? i.Id : i.Description
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
index 402ed7bf5..a90550d00 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
@@ -15,25 +15,25 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using UnityEditor;
-using UnityEngine.UIElements;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
 {
-    [CustomEditor(typeof(VoiceAsset)), CanEditMultipleObjects]
-    public class VoiceAssetInspector : SoundAssetInspector
-    {
-        [SerializeField] private VisualTreeAsset _voiceAssetInspector;
+	[CustomEditor(typeof(VoiceAsset)), CanEditMultipleObjects]
+	public class VoiceAssetInspector : SoundAssetInspector
+	{
+		[SerializeField]
+		private VisualTreeAsset _voiceAssetInspector;
 
-        public override VisualElement CreateInspectorGUI()
+		public override VisualElement CreateInspectorGUI()
 		{
-            var root = new VisualElement();
+			var root = new VisualElement();
 			var baseUi = base.CreateInspectorGUI();
-            root.Add(baseUi);
-            var subUi = _voiceAssetInspector.Instantiate();
-            root.Add(subUi);
-            return root;
+			root.Add(baseUi);
+			var subUi = _voiceAssetInspector.Instantiate();
+			root.Add(subUi);
+			return root;
 		}
-
-    }
-}
\ No newline at end of file
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
index 425568792..edf02dcb5 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
@@ -27,11 +27,24 @@ public abstract class BinaryEventSoundComponent<TEventSource, TEventArgs>
 		: EventSoundComponent<TEventSource, TEventArgs>
 		where TEventSource : class
 	{
-		public enum StartWhen { TurnedOn, TurnedOff };
-		public enum StopWhen { Never, TurnedOn, TurnedOff };
+		public enum StartWhen
+		{
+			TurnedOn,
+			TurnedOff,
+		};
+
+		public enum StopWhen
+		{
+			Never,
+			TurnedOn,
+			TurnedOff,
+		};
+
+		[SerializeField]
+		private StartWhen _startWhen = StartWhen.TurnedOn;
 
-		[SerializeField] private StartWhen _startWhen = StartWhen.TurnedOn;
-		[SerializeField] private StopWhen _stopWhen = StopWhen.Never;
+		[SerializeField]
+		private StopWhen _stopWhen = StopWhen.Never;
 
 		protected override async void OnEvent(object sender, TEventArgs e)
 		{
@@ -51,7 +64,6 @@ protected override async void OnEvent(object sender, TEventArgs e)
 
 		protected abstract bool InterpretAsBinary(TEventArgs e);
 
-		public override bool SupportsLoopingSoundAssets()
-			=> _stopWhen != StopWhen.Never;
+		public override bool SupportsLoopingSoundAssets() => _stopWhen != StopWhen.Never;
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
index 84c479406..7cdda835f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
@@ -16,8 +16,8 @@
 
 // ReSharper disable InconsistentNaming
 
-using UnityEngine;
 using System;
+using UnityEngine;
 
 namespace VisualPinball.Unity
 {
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
index f00b5a3e5..558257fd1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
@@ -44,7 +44,8 @@ protected override void OnEnableAfterAfterAwake()
 		protected override void OnDisable()
 		{
 			base.OnDisable();
-			if (_eventSource != null) {
+			if (_eventSource != null)
+			{
 				Unsubscribe(_eventSource);
 				_eventSource = null;
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
index ed380abd9..804eabb7f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
@@ -26,6 +26,7 @@ namespace VisualPinball.Unity
 	public class HitSoundComponent : EventSoundComponent<IApiHittable, HitEventArgs>
 	{
 		public override bool SupportsLoopingSoundAssets() => false;
+
 		public override Type GetRequiredType() => typeof(ItemComponent);
 
 		protected override bool TryFindEventSource(out IApiHittable hittable)
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 51280d778..bbb8ecb55 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -19,11 +19,17 @@
 
 namespace VisualPinball.Unity
 {
-    [CreateAssetMenu(fileName = "Music Asset", menuName = "Visual Pinball/Sound/Music Asset", order = 102)]
-    public class MusicAsset : SoundAsset
-    {
-        public float Volume => _volume;
+	[CreateAssetMenu(
+		fileName = "Music Asset",
+		menuName = "Visual Pinball/Sound/Music Asset",
+		order = 102
+	)]
+	public class MusicAsset : SoundAsset
+	{
+		public float Volume => _volume;
 
-        [SerializeField][Range(0f, 1f)] private float _volume;
-    }
-}
\ No newline at end of file
+		[SerializeField]
+		[Range(0f, 1f)]
+		private float _volume;
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index 65b438bd2..bf39f9e13 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -23,95 +23,106 @@
 
 namespace VisualPinball.Unity
 {
-    public class MusicCoordinator : MonoBehaviour
-    {
-        [Tooltip("How many seconds should transitions between songs take?")]
-        [SerializeField][Range(0f, 10f)] private float _fadeDuration = 3f;
+	public class MusicCoordinator : MonoBehaviour
+	{
+		[Tooltip("How many seconds should transitions between songs take?")]
+		[SerializeField]
+		[Range(0f, 10f)]
+		private float _fadeDuration = 3f;
 
-        private readonly List<MusicPlayer> _players = new();
-        private readonly List<MusicRequest> _requestStack = new();
-        private int _requestCounter;
+		private readonly List<MusicPlayer> _players = new();
+		private readonly List<MusicRequest> _requestStack = new();
+		private int _requestCounter;
 
-        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        /// <summary>
-        /// Insert a request into the request stack
-        /// </summary>
-        /// <param name="musicAsset">The requested music</param>
-        /// <param name="requestId">A unique identifier that can be used to remove the request later</param>
-        /// <param name="priority">The priority of the request</param>
-        public void AddRequest(MusicAsset musicAsset, out int requestId, SoundPriority priority = SoundPriority.Medium)
-        {
-            var request = new MusicRequest(musicAsset, _requestCounter, priority);
-            requestId = request.Id;
-            _requestCounter++;
-            _requestStack.Add(request);
+		/// <summary>
+		/// Insert a request into the request stack
+		/// </summary>
+		/// <param name="musicAsset">The requested music</param>
+		/// <param name="requestId">A unique identifier that can be used to remove the request later</param>
+		/// <param name="priority">The priority of the request</param>
+		public void AddRequest(
+			MusicAsset musicAsset,
+			out int requestId,
+			SoundPriority priority = SoundPriority.Medium
+		)
+		{
+			var request = new MusicRequest(musicAsset, _requestCounter, priority);
+			requestId = request.Id;
+			_requestCounter++;
+			_requestStack.Add(request);
 
-            EvaluateRequestStack();
-        }
+			EvaluateRequestStack();
+		}
 
-        /// <summary>
-        /// Remove a request that was previously added using <c>AddRequest</c>
-        /// </summary>
-        /// <param name="requestId"></param>
-        public void RemoveRequest(int requestId)
-        {
-            var i = _requestStack.FindIndex(x => x.Id == requestId);
-            if (i != -1)
-                _requestStack.RemoveAt(i);
-            else
-                Logger.Error(
-                    $"Can't remove music request with id '{requestId}' because there is no such "
-                    + "request in the stack.");
-            EvaluateRequestStack();
-        }
+		/// <summary>
+		/// Remove a request that was previously added using <c>AddRequest</c>
+		/// </summary>
+		/// <param name="requestId"></param>
+		public void RemoveRequest(int requestId)
+		{
+			var i = _requestStack.FindIndex(x => x.Id == requestId);
+			if (i != -1)
+				_requestStack.RemoveAt(i);
+			else
+				Logger.Error(
+					$"Can't remove music request with id '{requestId}' because there is no such "
+						+ "request in the stack."
+				);
+			EvaluateRequestStack();
+		}
 
-        private void EvaluateRequestStack()
-        {
-            _players.RemoveAll(x => x == null);
-            if (_requestStack.Count > 0)
-            {
-                _requestStack.Sort();
-                var musicToPlay = _requestStack[0].MusicAsset;
-                var playerToPlay = _players.FirstOrDefault(x => x.MusicAsset == musicToPlay);
-                if (playerToPlay == default)
-                {
-                    playerToPlay = gameObject.AddComponent<MusicPlayer>();
-                    playerToPlay.Init(musicToPlay, _fadeDuration);
-                    _players.Add(playerToPlay);
-                }
+		private void EvaluateRequestStack()
+		{
+			_players.RemoveAll(x => x == null);
+			if (_requestStack.Count > 0)
+			{
+				_requestStack.Sort();
+				var musicToPlay = _requestStack[0].MusicAsset;
+				var playerToPlay = _players.FirstOrDefault(x => x.MusicAsset == musicToPlay);
+				if (playerToPlay == default)
+				{
+					playerToPlay = gameObject.AddComponent<MusicPlayer>();
+					playerToPlay.Init(musicToPlay, _fadeDuration);
+					_players.Add(playerToPlay);
+				}
 
-                // No need to fade in if nothing else is playing
-                playerToPlay.StartAtFullVolume = !_players.Any(x => x.IsPlaying);
-                _players.ForEach(x => x.ShouldPlay = x == playerToPlay);
-            }
-            else
-                _players.ForEach(x => x.ShouldPlay = false);
-        }
+				// No need to fade in if nothing else is playing
+				playerToPlay.StartAtFullVolume = !_players.Any(x => x.IsPlaying);
+				_players.ForEach(x => x.ShouldPlay = x == playerToPlay);
+			}
+			else
+				_players.ForEach(x => x.ShouldPlay = false);
+		}
 
-        private readonly struct MusicRequest : IComparable<MusicRequest>
-        {
-            public MusicRequest(MusicAsset musicAsset, int id, SoundPriority priority = SoundPriority.Medium)
-            {
-                MusicAsset = musicAsset;
-                Priority = priority;
-                Time = DateTime.Now;
-                Id = id;
-            }
+		private readonly struct MusicRequest : IComparable<MusicRequest>
+		{
+			public MusicRequest(
+				MusicAsset musicAsset,
+				int id,
+				SoundPriority priority = SoundPriority.Medium
+			)
+			{
+				MusicAsset = musicAsset;
+				Priority = priority;
+				Time = DateTime.Now;
+				Id = id;
+			}
 
-            public readonly MusicAsset MusicAsset;
-            public readonly SoundPriority Priority;
-            public readonly DateTime Time;
-            public readonly int Id;
+			public readonly MusicAsset MusicAsset;
+			public readonly SoundPriority Priority;
+			public readonly DateTime Time;
+			public readonly int Id;
 
-            // Used to sort the request stack to determine which request to play
-            public int CompareTo(MusicRequest other)
-            {
-                if (Priority != other.Priority)
-                    return other.Priority.CompareTo(Priority);
-                // If priority is the same, favor newer requests
-                return other.Time.CompareTo(Time);
-            }
-        }
-    }
-}
\ No newline at end of file
+			// Used to sort the request stack to determine which request to play
+			public int CompareTo(MusicRequest other)
+			{
+				if (Priority != other.Priority)
+					return other.Priority.CompareTo(Priority);
+				// If priority is the same, favor newer requests
+				return other.Time.CompareTo(Time);
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index 98936c2e9..29d480c82 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -16,79 +16,78 @@
 
 using System;
 using System.Collections.Generic;
-
-
+using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
-using UnityEngine;
+
 
 namespace VisualPinball.Unity
 {
-    public class MusicPlayer : MonoBehaviour
-    {
-        public bool ShouldPlay { get; set; }
-        public bool IsPlaying => _audioSource != null && _audioSource.isPlaying;
-        public bool StartAtFullVolume { get; set; }
-        public MusicAsset MusicAsset { get; private set; }
+	public class MusicPlayer : MonoBehaviour
+	{
+		public bool ShouldPlay { get; set; }
+		public bool IsPlaying => _audioSource != null && _audioSource.isPlaying;
+		public bool StartAtFullVolume { get; set; }
+		public MusicAsset MusicAsset { get; private set; }
 
-        private AudioSource _audioSource;
-        private float _fadeDuration;
+		private AudioSource _audioSource;
+		private float _fadeDuration;
 
-        public void Init(MusicAsset musicAsset, float fadeDuration)
-        {
-            MusicAsset = musicAsset;
-            _fadeDuration = fadeDuration;
-        }
+		public void Init(MusicAsset musicAsset, float fadeDuration)
+		{
+			MusicAsset = musicAsset;
+			_fadeDuration = fadeDuration;
+		}
 
-        private void Start()
-        {
-            _audioSource = gameObject.AddComponent<AudioSource>();
-            _audioSource.volume = 0f;
-        }
+		private void Start()
+		{
+			_audioSource = gameObject.AddComponent<AudioSource>();
+			_audioSource.volume = 0f;
+		}
 
-        private void Update()
-        {
-            var canPlay = _audioSource.isActiveAndEnabled;
+		private void Update()
+		{
+			var canPlay = _audioSource.isActiveAndEnabled;
 #if UNITY_EDITOR
-            canPlay &= EditorApplication.isFocused;
+			canPlay &= EditorApplication.isFocused;
 #else
-            canPlay &= Application.isFocused;
+			canPlay &= Application.isFocused;
 #endif
-            if (ShouldPlay && canPlay && !_audioSource.isPlaying)
-            {
-                var oldVolume = _audioSource.volume;
-                MusicAsset.ConfigureAudioSource(_audioSource);
-                _audioSource.Play();
-                _audioSource.volume = StartAtFullVolume ? MusicAsset.Volume : oldVolume;
-            }
-            else if (!ShouldPlay && _audioSource.isPlaying && _audioSource.volume == 0f)
-            {
-                _audioSource.Stop();
-            }
+			if (ShouldPlay && canPlay && !_audioSource.isPlaying)
+			{
+				var oldVolume = _audioSource.volume;
+				MusicAsset.ConfigureAudioSource(_audioSource);
+				_audioSource.Play();
+				_audioSource.volume = StartAtFullVolume ? MusicAsset.Volume : oldVolume;
+			}
+			else if (!ShouldPlay && _audioSource.isPlaying && _audioSource.volume == 0f)
+			{
+				_audioSource.Stop();
+			}
 
-            var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
-            if (_audioSource.volume != targetVolume)
-            {
-                if (_fadeDuration == 0f)
-                {
-                    _audioSource.volume = targetVolume;
-                }
-                else
-                {
-                    if (_audioSource.volume < targetVolume)
-                        _audioSource.volume += 1 / _fadeDuration * Time.deltaTime;
-                    else
-                        _audioSource.volume -= 1 / _fadeDuration * Time.deltaTime;
-                    _audioSource.volume = Mathf.Clamp(_audioSource.volume, 0f, MusicAsset.Volume);
-                }
-            }
-        }
+			var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
+			if (_audioSource.volume != targetVolume)
+			{
+				if (_fadeDuration == 0f)
+				{
+					_audioSource.volume = targetVolume;
+				}
+				else
+				{
+					if (_audioSource.volume < targetVolume)
+						_audioSource.volume += 1 / _fadeDuration * Time.deltaTime;
+					else
+						_audioSource.volume -= 1 / _fadeDuration * Time.deltaTime;
+					_audioSource.volume = Mathf.Clamp(_audioSource.volume, 0f, MusicAsset.Volume);
+				}
+			}
+		}
 
-        private void OnDestroy()
-        {
-            if (_audioSource != null)
-                Destroy(_audioSource);
-        }
-    }
-}
\ No newline at end of file
+		private void OnDestroy()
+		{
+			if (_audioSource != null)
+				Destroy(_audioSource);
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index e5a1cd574..0f8b35b69 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -18,22 +18,27 @@
 
 namespace VisualPinball.Unity
 {
-    public class MusicRequest : MonoBehaviour
-    {
-        [SerializeField] private MusicCoordinator coordinator;
-        [SerializeField] private MusicAsset musicAsset;
-        [SerializeField] private SoundPriority _priority = SoundPriority.Medium;
+	public class MusicRequest : MonoBehaviour
+	{
+		[SerializeField]
+		private MusicCoordinator coordinator;
 
-        private int requestId;
+		[SerializeField]
+		private MusicAsset musicAsset;
 
-        private void OnEnable()
-        {
-            coordinator.AddRequest(musicAsset, out requestId, _priority);
-        }
+		[SerializeField]
+		private SoundPriority _priority = SoundPriority.Medium;
 
-        private void OnDisable()
-        {
-            coordinator.RemoveRequest(requestId);
-        }
-    }
-}
\ No newline at end of file
+		private int requestId;
+
+		private void OnEnable()
+		{
+			coordinator.AddRequest(musicAsset, out requestId, _priority);
+		}
+
+		private void OnDisable()
+		{
+			coordinator.RemoveRequest(requestId);
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index 777803e50..1ea041281 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -1,100 +1,112 @@
-// Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-// ReSharper disable InconsistentNaming
-
-using System;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.Audio;
-using Random = UnityEngine.Random;
-
-namespace VisualPinball.Unity
-{
-	public enum SoundPriority
-	{
-		Lowest,
-		Low,
-		Medium,
-		High,
-		Highest,
-	}
-
-	/// <summary>
-	/// Represents a reusable collection of similar sounds, for example different samples of a
-	/// flipper mechanism getting triggered. Supports multiple techniques to introduce variation
-	/// for frequently used sounds. Instances of this class can be stored in the project files or
-	/// in an asset library.
-	/// </summary>
-	public abstract class SoundAsset : ScriptableObject
-	{
-		private enum SelectionMethod
-		{
-			RoundRobin,
-			Random
-		}
-
-		[SerializeField] private string _description;
-		[SerializeField] private AudioClip[] _clips;
-		[SerializeField] private SelectionMethod _clipSelectionMethod;
-		[Tooltip("Should the sound appear to come from the position of the emitter?")]
-		[SerializeField] private bool _isSpatial = true;
-		[SerializeField] private AudioMixerGroup _audioMixerGroup;
-
-		[NonSerialized] private int _roundRobinIndex = 0;
-
-		public virtual void ConfigureAudioSource(AudioSource audioSource)
-		{
-			audioSource.clip = GetClip();
-			audioSource.spatialBlend = _isSpatial ? 0f : 1f;
-			audioSource.outputAudioMixerGroup = _audioMixerGroup;
-			audioSource.playOnAwake = false;
-		}
-
-		public bool IsValid()
-		{
-			if (_clips == null)
-				return false;
-
-			foreach (var clip in _clips)
-			{
-				if (clip != null)
-					return true;
-			}
-
-			return false;
-		}
-
-		private AudioClip GetClip()
-		{
-			_clips.ToList().RemoveAll(clip => clip == null);
-			if (_clips.Length == 0)
-				throw new InvalidOperationException($"The sound asset '{name}' has no audio clips to play.");
-			switch (_clipSelectionMethod)
-			{
-				case SelectionMethod.RoundRobin:
-					_roundRobinIndex %= _clips.Length;
-					var clip = _clips[_roundRobinIndex];
-					_roundRobinIndex++;
-					return clip;
-				case SelectionMethod.Random:
-					return _clips[Random.Range(0, _clips.Length)];
-				default:
-					throw new NotImplementedException("Selection method not implemented.");
-			}
-		}
-	}
-}
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using System;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Audio;
+using Random = UnityEngine.Random;
+
+namespace VisualPinball.Unity
+{
+	public enum SoundPriority
+	{
+		Lowest,
+		Low,
+		Medium,
+		High,
+		Highest,
+	}
+
+	/// <summary>
+	/// Represents a reusable collection of similar sounds, for example different samples of a
+	/// flipper mechanism getting triggered. Supports multiple techniques to introduce variation
+	/// for frequently used sounds. Instances of this class can be stored in the project files or
+	/// in an asset library.
+	/// </summary>
+	public abstract class SoundAsset : ScriptableObject
+	{
+		private enum SelectionMethod
+		{
+			RoundRobin,
+			Random,
+		}
+
+		[SerializeField]
+		private string _description;
+
+		[SerializeField]
+		private AudioClip[] _clips;
+
+		[SerializeField]
+		private SelectionMethod _clipSelectionMethod;
+
+		[Tooltip("Should the sound appear to come from the position of the emitter?")]
+		[SerializeField]
+		private bool _isSpatial = true;
+
+		[SerializeField]
+		private AudioMixerGroup _audioMixerGroup;
+
+		[NonSerialized]
+		private int _roundRobinIndex = 0;
+
+		public virtual void ConfigureAudioSource(AudioSource audioSource)
+		{
+			audioSource.clip = GetClip();
+			audioSource.spatialBlend = _isSpatial ? 0f : 1f;
+			audioSource.outputAudioMixerGroup = _audioMixerGroup;
+			audioSource.playOnAwake = false;
+		}
+
+		public bool IsValid()
+		{
+			if (_clips == null)
+				return false;
+
+			foreach (var clip in _clips)
+			{
+				if (clip != null)
+					return true;
+			}
+
+			return false;
+		}
+
+		private AudioClip GetClip()
+		{
+			_clips.ToList().RemoveAll(clip => clip == null);
+			if (_clips.Length == 0)
+				throw new InvalidOperationException(
+					$"The sound asset '{name}' has no audio clips to play."
+				);
+			switch (_clipSelectionMethod)
+			{
+				case SelectionMethod.RoundRobin:
+					_roundRobinIndex %= _clips.Length;
+					var clip = _clips[_roundRobinIndex];
+					_roundRobinIndex++;
+					return clip;
+				case SelectionMethod.Random:
+					return _clips[Random.Range(0, _clips.Length)];
+				default:
+					throw new NotImplementedException("Selection method not implemented.");
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index dccd2a47b..19f7d8a35 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -18,126 +18,167 @@
 using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 #if UNITY_EDITOR
 using UnityEditor;
 using UnityEditor.SceneManagement;
 #endif
-using UnityEngine.SceneManagement;
+
 
 namespace VisualPinball.Unity
 {
-    [CreateAssetMenu(fileName = "Sound Effect", menuName = "Visual Pinball/Sound/Sound Effect Asset", order = 102)]
-    public class SoundEffectAsset : SoundAsset
-    {
-        public bool Loop => _loop;
-
-        [SerializeField] private Vector2 _volumeRange = new(1f, 1f);
-        [SerializeField] private Vector2 _pitchRange = new(1f, 1f);
-        [SerializeField] private bool _loop;
-        [SerializeField, Range(0, 10f)] private float _fadeInTime;
-        [SerializeField, Range(0, 10f)] private float _fadeOutTime;
-
-        public override void ConfigureAudioSource(AudioSource audioSource)
-        {
-            base.ConfigureAudioSource(audioSource);
-            audioSource.volume = UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
-            audioSource.pitch = UnityEngine.Random.Range(_pitchRange.x, _pitchRange.y);
-        }
-
-        public async Task Play(GameObject audioObj, CancellationToken allowFadeOutCt, CancellationToken instantCt, float volume = 1f)
-        {
-            var audioSource = audioObj.AddComponent<AudioSource>();
-
-            try
-            {
-                ConfigureAudioSource(audioSource);
-                audioSource.volume *= volume;
-                audioSource.Play();
-                using var eitherCts = CancellationTokenSource.CreateLinkedTokenSource(allowFadeOutCt, instantCt);
-
-                // Fade in
-                if (_loop && _fadeInTime > 0f)
-                {
-                    try
-                    {
-                        await Fade(audioSource, 0f, audioSource.volume, _fadeInTime, eitherCts.Token);
-                    }
-                    catch (OperationCanceledException) { }
-                }
-                instantCt.ThrowIfCancellationRequested();
-
-                // Play until sound stops or cancellation is requested
-                try
-                {
-                    await WaitUntilAudioStops(audioSource, eitherCts.Token);
-                }
-                catch (OperationCanceledException) { }
-                instantCt.ThrowIfCancellationRequested();
-
-                // Fade out
-                if (audioSource != null && audioSource.isPlaying && _loop && _fadeOutTime > 0f)
-                {
-                    await Fade(audioSource, audioSource.volume, 0f, _fadeOutTime, instantCt);
-                }
-            }
-            finally
-            {
-                if (audioSource != null)
-                {
-                    if (Application.isPlaying)
-                        Destroy(audioSource);
-                    else
-                        DestroyImmediate(audioSource);
-                }
-            }
-        }
-        public static async Task Fade(AudioSource audioSource, float fromVolume, float toVolume, float duration, CancellationToken ct)
-        {
-            float progress = 0f;
+	[CreateAssetMenu(
+		fileName = "Sound Effect",
+		menuName = "Visual Pinball/Sound/Sound Effect Asset",
+		order = 102
+	)]
+	public class SoundEffectAsset : SoundAsset
+	{
+		public bool Loop => _loop;
+
+		[SerializeField]
+		private Vector2 _volumeRange = new(1f, 1f);
+
+		[SerializeField]
+		private Vector2 _pitchRange = new(1f, 1f);
+
+		[SerializeField]
+		private bool _loop;
+
+		[SerializeField, Range(0, 10f)]
+		private float _fadeInTime;
+
+		[SerializeField, Range(0, 10f)]
+		private float _fadeOutTime;
+
+		public override void ConfigureAudioSource(AudioSource audioSource)
+		{
+			base.ConfigureAudioSource(audioSource);
+			audioSource.volume = UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
+			audioSource.pitch = UnityEngine.Random.Range(_pitchRange.x, _pitchRange.y);
+		}
+
+		public async Task Play(
+			GameObject audioObj,
+			CancellationToken allowFadeOutCt,
+			CancellationToken instantCt,
+			float volume = 1f
+		)
+		{
+			var audioSource = audioObj.AddComponent<AudioSource>();
+
+			try
+			{
+				ConfigureAudioSource(audioSource);
+				audioSource.volume *= volume;
+				audioSource.Play();
+				using var eitherCts = CancellationTokenSource.CreateLinkedTokenSource(
+					allowFadeOutCt,
+					instantCt
+				);
+
+				// Fade in
+				if (_loop && _fadeInTime > 0f)
+				{
+					try
+					{
+						await Fade(
+							audioSource,
+							0f,
+							audioSource.volume,
+							_fadeInTime,
+							eitherCts.Token
+						);
+					}
+					catch (OperationCanceledException) { }
+				}
+				instantCt.ThrowIfCancellationRequested();
+
+				// Play until sound stops or cancellation is requested
+				try
+				{
+					await WaitUntilAudioStops(audioSource, eitherCts.Token);
+				}
+				catch (OperationCanceledException) { }
+				instantCt.ThrowIfCancellationRequested();
+
+				// Fade out
+				if (audioSource != null && audioSource.isPlaying && _loop && _fadeOutTime > 0f)
+				{
+					await Fade(audioSource, audioSource.volume, 0f, _fadeOutTime, instantCt);
+				}
+			}
+			finally
+			{
+				if (audioSource != null)
+				{
+					if (Application.isPlaying)
+						Destroy(audioSource);
+					else
+						DestroyImmediate(audioSource);
+				}
+			}
+		}
+
+		public static async Task Fade(
+			AudioSource audioSource,
+			float fromVolume,
+			float toVolume,
+			float duration,
+			CancellationToken ct
+		)
+		{
+			float progress = 0f;
 #if UNITY_EDITOR
-            // Time.deltaTime doesn't really work in the editor outside play mode
-            var lastTime = EditorApplication.timeSinceStartup;
+			// Time.deltaTime doesn't really work in the editor outside play mode
+			var lastTime = EditorApplication.timeSinceStartup;
 #endif
-            while (progress < 1f)
-            {
-                ct.ThrowIfCancellationRequested();
-                audioSource.volume = Mathf.Lerp(fromVolume, toVolume, progress);
+			while (progress < 1f)
+			{
+				ct.ThrowIfCancellationRequested();
+				audioSource.volume = Mathf.Lerp(fromVolume, toVolume, progress);
 #if UNITY_EDITOR
-                var deltaTime = (float)(EditorApplication.timeSinceStartup - lastTime);
-                lastTime = EditorApplication.timeSinceStartup;
+				var deltaTime = (float)(EditorApplication.timeSinceStartup - lastTime);
+				lastTime = EditorApplication.timeSinceStartup;
 #else
 				var deltaTime = Time.deltaTime;
 #endif
-                progress += (1f / duration) * deltaTime;
-                await Task.Yield();
-            }
-        }
+				progress += (1f / duration) * deltaTime;
+				await Task.Yield();
+			}
+		}
 
 #if UNITY_EDITOR
-        public async Task PlayInEditorPreviewScene(CancellationToken allowFadeOutCt, CancellationToken instantCt)
-        {
-            Scene previewScene = EditorSceneManager.NewPreviewScene();
-            try
-            {
-                previewScene.name = "VPE Audio Preview";
-                var audioObj = new GameObject("Audio Preview");
-                SceneManager.MoveGameObjectToScene(audioObj, previewScene);
-                await Play(audioObj, allowFadeOutCt, instantCt);
-            }
-            finally
-            {
-                EditorSceneManager.ClosePreviewScene(previewScene);
-            }
-        }
+		public async Task PlayInEditorPreviewScene(
+			CancellationToken allowFadeOutCt,
+			CancellationToken instantCt
+		)
+		{
+			Scene previewScene = EditorSceneManager.NewPreviewScene();
+			try
+			{
+				previewScene.name = "VPE Audio Preview";
+				var audioObj = new GameObject("Audio Preview");
+				SceneManager.MoveGameObjectToScene(audioObj, previewScene);
+				await Play(audioObj, allowFadeOutCt, instantCt);
+			}
+			finally
+			{
+				EditorSceneManager.ClosePreviewScene(previewScene);
+			}
+		}
 #endif
 
-        public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
-        {
-            while (audioSource != null && (audioSource.isPlaying || (Application.isPlaying && !Application.isFocused)))
-            {
-                await Task.Yield();
-                ct.ThrowIfCancellationRequested();
-            }
-        }
-    }
-}
\ No newline at end of file
+		public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
+		{
+			while (
+				audioSource != null
+				&& (audioSource.isPlaying || (Application.isPlaying && !Application.isFocused))
+			)
+			{
+				await Task.Yield();
+				ct.ThrowIfCancellationRequested();
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
index 42277adcf..a2749d59c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
@@ -17,11 +17,11 @@
 // ReSharper disable InconsistentNaming
 
 using System;
-using NLog;
-using Logger = NLog.Logger;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using UnityEngine;
+using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
 {
@@ -33,6 +33,7 @@ public class SoundEffectComponent : EnableAfterAwakeComponent
 	{
 		[SerializeReference]
 		protected SoundEffectAsset _soundAsset;
+
 		[SerializeField]
 		[Tooltip("Should the sound be interrupted if it is triggered again while already playing?")]
 		protected bool _interrupt;
@@ -63,41 +64,49 @@ protected virtual void OnDisable()
 
 		public async Task Play()
 		{
-			if (!isActiveAndEnabled) {
+			if (!isActiveAndEnabled)
+			{
 				Logger.Warn("Cannot play a disabled sound component.");
 				return;
 			}
-			if (_soundAsset == null) {
+			if (_soundAsset == null)
+			{
 				Logger.Warn("Cannot play without sound asset. Assign it in the inspector.");
 				return;
 			}
 			float timeSinceLastPlay = Time.unscaledTime - _lastPlayStartTime;
-			if (timeSinceLastPlay < 0.01f) {
-				Logger.Warn($"Sound spam protection engaged. Time since last play was less than " +
-					$"0.01 seconds ({timeSinceLastPlay}). There is probably something wrong with " +
-					$"the calling code.");
+			if (timeSinceLastPlay < 0.01f)
+			{
+				Logger.Warn(
+					$"Sound spam protection engaged. Time since last play was less than "
+						+ $"0.01 seconds ({timeSinceLastPlay}). There is probably something wrong with "
+						+ $"the calling code."
+				);
 				return;
 			}
 
 			if (_interrupt) {
 				Stop(allowFade: true);
-			}
-			try {
+			try
+			{
 				_lastPlayStartTime = Time.unscaledTime;
 				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
-			} catch (OperationCanceledException) { }
+			}
+			catch (OperationCanceledException) { }
 		}
 
 		public void Stop(bool allowFade)
 		{
 			if (!isActiveAndEnabled) {
 				return;
-			}
-			if (allowFade) {
+			if (allowFade)
+			{
 				_allowFadeCts?.Cancel();
 				_allowFadeCts?.Dispose();
-				_allowFadeCts = new CancellationTokenSource();
-			} else {
+				_allowFadeCts = new();
+			}
+			else
+			{
 				_instantCts?.Cancel();
 				_instantCts?.Dispose();
 				_instantCts = new CancellationTokenSource();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs
deleted file mode 100644
index f308ebdbb..000000000
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-using UnityEngine;
-using System.Threading;
-using System.Threading.Tasks;
-using System;
-using UnityEngine.SceneManagement;
-#if UNITY_EDITOR
-using UnityEditor;
-using UnityEditor.SceneManagement;
-#endif
-
-namespace VisualPinball.Unity
-{
-	/// <summary>
-	/// Provides utility functions for playing sounds at runtime and in the editor with support for fading the volume in and out.
-	/// </summary>
-	public static class SoundUtils
-	{
-
-	}
-}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs.meta
deleted file mode 100644
index aba75f0dd..000000000
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundUtils.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 39c1161b40f535947ad995908584d38a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
index c7374e64e..aaceeeb90 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
@@ -36,11 +36,10 @@ protected override bool TryFindEventSource(out IApiSwitch @switch)
 		{
 			@switch = null;
 			var player = GetComponentInParent<Player>();
-			if (player == null) {
+			if (player == null)
 				return false;
-			}
-
-			foreach (var component in GetComponents<ISwitchDeviceComponent>()) {
+			foreach (var component in GetComponents<ISwitchDeviceComponent>())
+			{
 				@switch = player.Switch(component, _switchName);
 				if (@switch != null) {
 					return true;
@@ -51,7 +50,8 @@ protected override bool TryFindEventSource(out IApiSwitch @switch)
 
 		protected override void Subscribe(IApiSwitch eventSource) => eventSource.Switch += OnEvent;
 
-		protected override void Unsubscribe(IApiSwitch eventSource) => eventSource.Switch -= OnEvent;
+		protected override void Unsubscribe(IApiSwitch eventSource) =>
+			eventSource.Switch -= OnEvent;
 
 		protected override bool InterpretAsBinary(SwitchEventArgs e) => e.IsEnabled;
 	}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
index 77c55fae9..d4716ea66 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
@@ -14,18 +14,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System.Threading;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace VisualPinball.Unity
 {
-    [CreateAssetMenu(fileName = "Voice Asset", menuName = "Visual Pinball/Sound/Voice Asset", order = 102)]
+	[CreateAssetMenu(
+		fileName = "Voice Asset",
+		menuName = "Visual Pinball/Sound/Voice Asset",
+		order = 102
+	)]
+	public class VoiceAsset : SoundAsset
+	{
+		public SoundPriority Priority => _priority;
 
-    public class VoiceAsset : SoundAsset
-    {
-        public SoundPriority Priority => _priority;
-
-        [SerializeField] private SoundPriority _priority;
+		[SerializeField]
+		private SoundPriority _priority;
 	}
-}
\ No newline at end of file
+}

From 99bc805b06e30892590ac807fa2a676015718b65 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:31:44 +0100
Subject: [PATCH 05/53] Remove unneccessary usings

---
 .../Sound/SoundEffectAssetInspector.cs                         | 1 -
 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs   | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
index c2bb7f74a..025e37432 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
@@ -16,7 +16,6 @@
 
 using System;
 using System.Threading;
-using Mono.Cecil.Cil;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index 29d480c82..694251513 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -14,14 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
-using System.Collections.Generic;
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 
-
 namespace VisualPinball.Unity
 {
 	public class MusicPlayer : MonoBehaviour

From 61a1bfe76fc0a24577184ea4c90ffbc6a14dd0d2 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:34:39 +0100
Subject: [PATCH 06/53] Update year in copyright notice

---
 .../Sound/CoilSoundComponentInspector.cs                        | 2 +-
 .../VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs     | 2 +-
 .../VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs     | 2 +-
 .../VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs | 2 +-
 .../Sound/SoundEffectAssetInspector.cs                          | 2 +-
 .../Sound/SwitchSoundComponentInspector.cs                      | 2 +-
 .../VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs     | 2 +-
 .../VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs      | 2 +-
 .../VisualPinball.Unity/Sound/CoilSoundComponent.cs             | 2 +-
 .../VisualPinball.Unity/Sound/EventSoundComponent.cs            | 2 +-
 .../VisualPinball.Unity/Sound/HitSoundComponent.cs              | 2 +-
 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs     | 2 +-
 .../VisualPinball.Unity/Sound/SoundEffectComponent.cs           | 2 +-
 .../VisualPinball.Unity/Sound/SwitchSoundComponent.cs           | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
index d1bd0a02b..a5d231b93 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
index fbc28d9a2..07908844a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/MusicAssetInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
index 282f95c20..f016f38ab 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index ad516f75b..8aa197f65 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
index 025e37432..c628f1713 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
index 599a2cb89..bd471dbf6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
index a90550d00..cdead9cb2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
index edf02dcb5..a3b9ee87e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
index 7cdda835f..fd81e8825 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
index 558257fd1..adad0ae81 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
index 804eabb7f..8af31d264 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index 1ea041281..cafa14507 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
index a2749d59c..9c47d64c4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
index aaceeeb90..bc5916870 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

From 23caa6593f3a6feadc3949e4571eb01890ecea6e Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:36:02 +0100
Subject: [PATCH 07/53] Remove resharper warning disable

---
 .../VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs | 2 --
 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs     | 2 --
 .../VisualPinball.Unity/Sound/SoundEffectComponent.cs           | 2 --
 3 files changed, 6 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index 8aa197f65..363793559 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-// ReSharper disable InconsistentNaming
-
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index cafa14507..e92c153ef 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-// ReSharper disable InconsistentNaming
-
 using System;
 using System.Linq;
 using UnityEngine;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
index 9c47d64c4..a3d129ea6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-// ReSharper disable InconsistentNaming
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;

From f3adb682fe35bce0185cc6dd7e0be3acb2cb3e2c Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 22:02:01 +0100
Subject: [PATCH 08/53] Add callout sounds

---
 .../Sound/VoiceAssetInspector.cs.meta         |  2 +-
 .../Sound/VoiceAssetInspector.uxml            |  1 -
 .../Sound/CalloutCoordinator.cs               | 88 +++++++++++++++++++
 .../Sound/CalloutCoordinator.cs.meta          | 11 +++
 .../Sound/CalloutRequest.cs                   | 60 +++++++++++++
 .../Sound/CalloutRequest.cs.meta              | 11 +++
 .../Sound/CalloutRequester.cs                 | 41 +++++++++
 .../Sound/CalloutRequester.cs.meta            | 11 +++
 .../VisualPinball.Unity/Sound/SoundAsset.cs   | 12 +++
 .../Sound/SoundEffectAsset.cs                 | 13 ---
 .../VisualPinball.Unity/Sound/VoiceAsset.cs   | 26 +++++-
 11 files changed, 258 insertions(+), 18 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
index 8a01cf799..399543919 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences:
   - _soundAssetInspectorAsset: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
       type: 3}
-  - voiceAssetInspector: {fileID: 9197481963319205126, guid: c4009cb1062e5514c9aedd330f512328,
+  - _voiceAssetInspector: {fileID: 9197481963319205126, guid: c4009cb1062e5514c9aedd330f512328,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
index bf5d53a4c..175bd9965 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
@@ -1,3 +1,2 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:PropertyField binding-path="_priority" label="Priority" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
new file mode 100644
index 000000000..038b09891
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -0,0 +1,88 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	public class CalloutCoordinator : MonoBehaviour
+	{
+		[SerializeField]
+		[Range(0f, 3f)]
+		[Tooltip("How many seconds to pause after a callout before the next one can be started")]
+		private float _pauseDuration;
+
+		private readonly List<CalloutRequest> calloutQ = new();
+		private CancellationTokenSource _loopCts;
+		private Task _loopTask;
+		private TaskCompletionSource<bool> _waitForNewCalloutTcs;
+
+		public void EnqueueCallout(CalloutRequest callout)
+		{
+			var i = calloutQ.FindIndex(x => x.Priority < callout.Priority);
+			if (i != -1)
+				calloutQ.Insert(i, callout);
+			else
+				calloutQ.Add(callout);
+			_waitForNewCalloutTcs?.TrySetResult(true);
+		}
+
+		private void OnEnable()
+		{
+			_loopCts = new();
+			_loopTask = CalloutLoop(_loopCts.Token);
+		}
+
+		private async void OnDisable()
+		{
+			_loopCts.Cancel();
+			_loopCts.Dispose();
+			_waitForNewCalloutTcs?.TrySetCanceled();
+			try
+			{
+				await _loopTask;
+			}
+			catch (OperationCanceledException) { }
+		}
+
+		private async Task CalloutLoop(CancellationToken ct)
+		{
+			ct.ThrowIfCancellationRequested();
+			while (true)
+			{
+				calloutQ.RemoveAll(x => x.IsExpired());
+
+				if (calloutQ.Count > 0)
+				{
+					var callout = calloutQ[0];
+					calloutQ.RemoveAt(0);
+					await callout.Play(gameObject, ct);
+					await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
+				}
+				else
+				{
+					_waitForNewCalloutTcs = new();
+					await _waitForNewCalloutTcs.Task;
+				}
+				ct.ThrowIfCancellationRequested();
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta
new file mode 100644
index 000000000..e6128bac4
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9a5b2585dbd60ec4c88d8ead8b06c545
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
new file mode 100644
index 000000000..135f7d5d0
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
@@ -0,0 +1,60 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	public struct CalloutRequest
+	{
+		public SoundPriority Priority { get; private set; }
+
+		private readonly VoiceAsset _voiceAsset;
+		private readonly float _deadline;
+
+		/// <summary>
+		/// Create a callout
+		/// </summary>
+		/// <param name="voiceAsset">The voice asset to play</param>
+		/// <param name="priority">Higher priority callouts will play before lower priority ones</param>
+		/// <param name="maxQueueTime">How many seconds to wait in the queue before discarding the request. -1 = no limit</param>
+		public CalloutRequest(
+			VoiceAsset voiceAsset,
+			SoundPriority priority,
+			float maxQueueTime = -1f
+		)
+		{
+			_voiceAsset = voiceAsset;
+			Priority = priority;
+			if (maxQueueTime != -1f)
+				_deadline = Time.time + maxQueueTime;
+			else
+				_deadline = -1f;
+		}
+
+		public readonly bool IsExpired()
+		{
+			if (_deadline == -1f)
+				return false;
+			return Time.time > _deadline;
+		}
+
+		public readonly async Task Play(GameObject audioObj, CancellationToken ct) =>
+			await _voiceAsset.Play(audioObj, ct);
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta
new file mode 100644
index 000000000..908c5314c
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: df6efae3e44adcb4ba572487750d7b96
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
new file mode 100644
index 000000000..146de0f36
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
@@ -0,0 +1,41 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	public class CalloutRequester : MonoBehaviour
+	{
+		[SerializeField]
+		private VoiceAsset _voiceAsset;
+
+		[SerializeField]
+		private SoundPriority _priority = SoundPriority.Medium;
+
+		[SerializeField]
+		private CalloutCoordinator _coordinator;
+
+		[SerializeField]
+		private float _maxQueueTime = -1f;
+
+		private void OnEnable()
+		{
+			var request = new CalloutRequest(_voiceAsset, _priority, _maxQueueTime);
+			_coordinator.EnqueueCallout(request);
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta
new file mode 100644
index 000000000..78fb48c59
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c716757e0309b354b92dfe38da29afe5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index e92c153ef..cf820e665 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -16,6 +16,9 @@
 
 using System;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.Audio;
 using Random = UnityEngine.Random;
@@ -106,5 +109,14 @@ private AudioClip GetClip()
 					throw new NotImplementedException("Selection method not implemented.");
 			}
 		}
+
+		public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
+		{
+			while (audioSource != null && (audioSource.isPlaying || !EditorApplication.isFocused))
+			{
+				await Task.Yield();
+				ct.ThrowIfCancellationRequested();
+			}
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 19f7d8a35..89a926a02 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -24,7 +24,6 @@
 using UnityEditor.SceneManagement;
 #endif
 
-
 namespace VisualPinball.Unity
 {
 	[CreateAssetMenu(
@@ -168,17 +167,5 @@ CancellationToken instantCt
 			}
 		}
 #endif
-
-		public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
-		{
-			while (
-				audioSource != null
-				&& (audioSource.isPlaying || (Application.isPlaying && !Application.isFocused))
-			)
-			{
-				await Task.Yield();
-				ct.ThrowIfCancellationRequested();
-			}
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
index d4716ea66..90e1fc5f9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+using System.Threading;
+using System.Threading.Tasks;
 using UnityEngine;
 
 namespace VisualPinball.Unity
@@ -25,9 +27,27 @@ namespace VisualPinball.Unity
 	)]
 	public class VoiceAsset : SoundAsset
 	{
-		public SoundPriority Priority => _priority;
+		public async Task Play(GameObject audioObj, CancellationToken ct)
+		{
+			ct.ThrowIfCancellationRequested();
+			var audioSource = audioObj.AddComponent<AudioSource>();
 
-		[SerializeField]
-		private SoundPriority _priority;
+			try
+			{
+				ConfigureAudioSource(audioSource);
+				audioSource.Play();
+				await WaitUntilAudioStops(audioSource, ct);
+			}
+			finally
+			{
+				if (audioSource != null)
+				{
+					if (Application.isPlaying)
+						Destroy(audioSource);
+					else
+						DestroyImmediate(audioSource);
+				}
+			}
+		}
 	}
 }

From b0f300fdda5aa6b98c1638603b034f7cb4e60a00 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Mon, 10 Feb 2025 22:07:42 +0100
Subject: [PATCH 09/53] Overhaul callout loop

---
 .../Sound/CalloutCoordinator.cs                  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index 038b09891..0c7f14993 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -64,24 +64,20 @@ private async void OnDisable()
 
 		private async Task CalloutLoop(CancellationToken ct)
 		{
-			ct.ThrowIfCancellationRequested();
 			while (true)
 			{
 				calloutQ.RemoveAll(x => x.IsExpired());
 
-				if (calloutQ.Count > 0)
-				{
-					var callout = calloutQ[0];
-					calloutQ.RemoveAt(0);
-					await callout.Play(gameObject, ct);
-					await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
-				}
-				else
+				if (calloutQ.Count == 0)
 				{
 					_waitForNewCalloutTcs = new();
 					await _waitForNewCalloutTcs.Task;
 				}
-				ct.ThrowIfCancellationRequested();
+
+				var callout = calloutQ[0];
+				calloutQ.RemoveAt(0);
+				await callout.Play(gameObject, ct);
+				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
 			}
 		}
 	}

From 99da65290f6582444f9acebddbe15334d51d8dbf Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:02:12 +0100
Subject: [PATCH 10/53] Change music request API

---
 .../Sound/MusicCoordinator.cs                 | 42 +++--------------
 .../VisualPinball.Unity/Sound/MusicRequest.cs | 39 +++++++++-------
 .../Sound/MusicRequest.cs.meta                |  2 +-
 .../Sound/MusicRequester.cs                   | 45 +++++++++++++++++++
 .../Sound/MusicRequester.cs.meta              | 11 +++++
 5 files changed, 84 insertions(+), 55 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index bf39f9e13..d57b90975 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -42,14 +42,10 @@ public class MusicCoordinator : MonoBehaviour
 		/// <param name="musicAsset">The requested music</param>
 		/// <param name="requestId">A unique identifier that can be used to remove the request later</param>
 		/// <param name="priority">The priority of the request</param>
-		public void AddRequest(
-			MusicAsset musicAsset,
-			out int requestId,
-			SoundPriority priority = SoundPriority.Medium
-		)
+		public void AddRequest(MusicRequest request, out int requestId)
 		{
-			var request = new MusicRequest(musicAsset, _requestCounter, priority);
-			requestId = request.Id;
+			request.Index = _requestCounter;
+			requestId = request.Index;
 			_requestCounter++;
 			_requestStack.Add(request);
 
@@ -62,7 +58,7 @@ public void AddRequest(
 		/// <param name="requestId"></param>
 		public void RemoveRequest(int requestId)
 		{
-			var i = _requestStack.FindIndex(x => x.Id == requestId);
+			var i = _requestStack.FindIndex(x => x.Index == requestId);
 			if (i != -1)
 				_requestStack.RemoveAt(i);
 			else
@@ -70,6 +66,7 @@ public void RemoveRequest(int requestId)
 					$"Can't remove music request with id '{requestId}' because there is no such "
 						+ "request in the stack."
 				);
+
 			EvaluateRequestStack();
 		}
 
@@ -95,34 +92,5 @@ private void EvaluateRequestStack()
 			else
 				_players.ForEach(x => x.ShouldPlay = false);
 		}
-
-		private readonly struct MusicRequest : IComparable<MusicRequest>
-		{
-			public MusicRequest(
-				MusicAsset musicAsset,
-				int id,
-				SoundPriority priority = SoundPriority.Medium
-			)
-			{
-				MusicAsset = musicAsset;
-				Priority = priority;
-				Time = DateTime.Now;
-				Id = id;
-			}
-
-			public readonly MusicAsset MusicAsset;
-			public readonly SoundPriority Priority;
-			public readonly DateTime Time;
-			public readonly int Id;
-
-			// Used to sort the request stack to determine which request to play
-			public int CompareTo(MusicRequest other)
-			{
-				if (Priority != other.Priority)
-					return other.Priority.CompareTo(Priority);
-				// If priority is the same, favor newer requests
-				return other.Time.CompareTo(Time);
-			}
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index 0f8b35b69..8a3cdb8c3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -14,31 +14,36 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using UnityEngine;
+using System;
 
 namespace VisualPinball.Unity
 {
-	public class MusicRequest : MonoBehaviour
+	public struct MusicRequest : IComparable<MusicRequest>
 	{
-		[SerializeField]
-		private MusicCoordinator coordinator;
-
-		[SerializeField]
-		private MusicAsset musicAsset;
-
-		[SerializeField]
-		private SoundPriority _priority = SoundPriority.Medium;
-
-		private int requestId;
-
-		private void OnEnable()
+		public MusicRequest(MusicAsset musicAsset, SoundPriority priority = SoundPriority.Medium)
 		{
-			coordinator.AddRequest(musicAsset, out requestId, _priority);
+			MusicAsset = musicAsset;
+			Priority = priority;
+			Index = -1;
 		}
 
-		private void OnDisable()
+		public readonly MusicAsset MusicAsset;
+		public readonly SoundPriority Priority;
+
+		/// <summary>
+		/// The <c>MusicCoordinator</c> sets the <c>Index</c> of the <c>n</c>th request it receives
+		/// to <c>n</c>. This allows sorting requests by receive order and uniquely identifies each
+		/// request so it can be removed later usinig its <c>Index</c>.
+		/// </summary>
+		public int Index { get; set; }
+
+		// Used to sort the request stack to determine which request to play
+		public int CompareTo(MusicRequest other)
 		{
-			coordinator.RemoveRequest(requestId);
+			if (Priority != other.Priority)
+				return other.Priority.CompareTo(Priority);
+			// If priority is the same, favor newer requests
+			return other.Index.CompareTo(Index);
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta
index 7fab37218..41238309c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a3f0b8ca7954c04baffe0e10ea16eef
+guid: 4332fea2301a25948bd8b7976b93af53
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
new file mode 100644
index 000000000..80601b622
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -0,0 +1,45 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	public class MusicRequester : MonoBehaviour
+	{
+		[SerializeField]
+		private MusicCoordinator coordinator;
+
+		[SerializeField]
+		private MusicAsset musicAsset;
+
+		[SerializeField]
+		private SoundPriority _priority = SoundPriority.Medium;
+
+		private int requestId;
+
+		private void OnEnable()
+		{
+			var request = new MusicRequest(musicAsset, _priority);
+			coordinator.AddRequest(request, out requestId);
+		}
+
+		private void OnDisable()
+		{
+			coordinator.RemoveRequest(requestId);
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta
new file mode 100644
index 000000000..7fab37218
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6a3f0b8ca7954c04baffe0e10ea16eef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From 625f61dd738ccf5139cd14c724941716d88f52cb Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 16:34:32 +0100
Subject: [PATCH 11/53] Only sound effects may be spatial

---
 .../Sound/SoundEffectAssetInspector.uxml          |  3 ++-
 .../VisualPinball.Unity/Sound/SoundAsset.cs       | 12 +++---------
 .../VisualPinball.Unity/Sound/SoundEffectAsset.cs | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
index 171455636..77928c6a9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
@@ -1,5 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" />
+    <uie:PropertyField name="type" binding-path="_type" label="Type" tooltip="In a real pinball machine, would this sound come from a mechanism (Mechanical) or from the speakers (Synthetic)?" class="unity-base-field__aligned" />
+    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" tooltip="sadfassdfsfd" />
     <uie:PropertyField name="fade-in-time" binding-path="_fadeInTime" label="Fade In Time" />
     <uie:PropertyField name="fade-out-time" binding-path="_fadeOutTime" label="Fade Out Time" />
     <ui:MinMaxSlider label="Volume Range" min-value="1" max-value="1" low-limit="0" high-limit="1" tooltip="Volume will be randomized within this range (0 - 1)" binding-path="_volumeRange" name="volume-range" class="unity-base-field__aligned" />
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index cf820e665..acdf291be 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -35,10 +35,9 @@ public enum SoundPriority
 	}
 
 	/// <summary>
-	/// Represents a reusable collection of similar sounds, for example different samples of a
-	/// flipper mechanism getting triggered. Supports multiple techniques to introduce variation
-	/// for frequently used sounds. Instances of this class can be stored in the project files or
-	/// in an asset library.
+	/// Common base class for sound effect assets, voice assets, and music assets. Multiple audio
+	/// clips can be assigned for variation. Instances of this class are Unity assets and can
+	/// therefore be stored in the project files or in an asset library for reuse across tables.
 	/// </summary>
 	public abstract class SoundAsset : ScriptableObject
 	{
@@ -57,10 +56,6 @@ private enum SelectionMethod
 		[SerializeField]
 		private SelectionMethod _clipSelectionMethod;
 
-		[Tooltip("Should the sound appear to come from the position of the emitter?")]
-		[SerializeField]
-		private bool _isSpatial = true;
-
 		[SerializeField]
 		private AudioMixerGroup _audioMixerGroup;
 
@@ -70,7 +65,6 @@ private enum SelectionMethod
 		public virtual void ConfigureAudioSource(AudioSource audioSource)
 		{
 			audioSource.clip = GetClip();
-			audioSource.spatialBlend = _isSpatial ? 0f : 1f;
 			audioSource.outputAudioMixerGroup = _audioMixerGroup;
 			audioSource.playOnAwake = false;
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 89a926a02..2d772c8a1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -26,6 +26,17 @@
 
 namespace VisualPinball.Unity
 {
+	public enum SoundEffectType
+	{
+		Mechanical,
+		Synthetic,
+	}
+
+	/// <summary>
+	/// Represents a reusable collection of similar sounds, for example different samples of a
+	/// flipper mechanism getting triggered. Supports randomizing pitch and volume to introduce
+	/// variation.
+	/// </summary>
 	[CreateAssetMenu(
 		fileName = "Sound Effect",
 		menuName = "Visual Pinball/Sound/Sound Effect Asset",
@@ -41,6 +52,9 @@ public class SoundEffectAsset : SoundAsset
 		[SerializeField]
 		private Vector2 _pitchRange = new(1f, 1f);
 
+		[SerializeField]
+		private SoundEffectType _type;
+
 		[SerializeField]
 		private bool _loop;
 
@@ -53,6 +67,7 @@ public class SoundEffectAsset : SoundAsset
 		public override void ConfigureAudioSource(AudioSource audioSource)
 		{
 			base.ConfigureAudioSource(audioSource);
+			audioSource.spatialBlend = _type == SoundEffectType.Mechanical ? 1f : 0f;
 			audioSource.volume = UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
 			audioSource.pitch = UnityEngine.Random.Range(_pitchRange.x, _pitchRange.y);
 		}

From 265b6fd69318be3038f324e6421de0de73495962 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 16:42:39 +0100
Subject: [PATCH 12/53] Always _ before private fields

---
 .../Sound/CalloutCoordinator.cs                  | 16 ++++++++--------
 .../VisualPinball.Unity/Sound/MusicRequester.cs  | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index 0c7f14993..c0f01ad15 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -29,18 +29,18 @@ public class CalloutCoordinator : MonoBehaviour
 		[Tooltip("How many seconds to pause after a callout before the next one can be started")]
 		private float _pauseDuration;
 
-		private readonly List<CalloutRequest> calloutQ = new();
+		private readonly List<CalloutRequest> _calloutQ = new();
 		private CancellationTokenSource _loopCts;
 		private Task _loopTask;
 		private TaskCompletionSource<bool> _waitForNewCalloutTcs;
 
 		public void EnqueueCallout(CalloutRequest callout)
 		{
-			var i = calloutQ.FindIndex(x => x.Priority < callout.Priority);
+			var i = _calloutQ.FindIndex(x => x.Priority < callout.Priority);
 			if (i != -1)
-				calloutQ.Insert(i, callout);
+				_calloutQ.Insert(i, callout);
 			else
-				calloutQ.Add(callout);
+				_calloutQ.Add(callout);
 			_waitForNewCalloutTcs?.TrySetResult(true);
 		}
 
@@ -66,16 +66,16 @@ private async Task CalloutLoop(CancellationToken ct)
 		{
 			while (true)
 			{
-				calloutQ.RemoveAll(x => x.IsExpired());
+				_calloutQ.RemoveAll(x => x.IsExpired());
 
-				if (calloutQ.Count == 0)
+				if (_calloutQ.Count == 0)
 				{
 					_waitForNewCalloutTcs = new();
 					await _waitForNewCalloutTcs.Task;
 				}
 
-				var callout = calloutQ[0];
-				calloutQ.RemoveAt(0);
+				var callout = _calloutQ[0];
+				_calloutQ.RemoveAt(0);
 				await callout.Play(gameObject, ct);
 				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
index 80601b622..1baff4834 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -21,10 +21,10 @@ namespace VisualPinball.Unity
 	public class MusicRequester : MonoBehaviour
 	{
 		[SerializeField]
-		private MusicCoordinator coordinator;
+		private MusicCoordinator _coordinator;
 
 		[SerializeField]
-		private MusicAsset musicAsset;
+		private MusicAsset _musicAsset;
 
 		[SerializeField]
 		private SoundPriority _priority = SoundPriority.Medium;
@@ -33,13 +33,13 @@ public class MusicRequester : MonoBehaviour
 
 		private void OnEnable()
 		{
-			var request = new MusicRequest(musicAsset, _priority);
-			coordinator.AddRequest(request, out requestId);
+			var request = new MusicRequest(_musicAsset, _priority);
+			_coordinator.AddRequest(request, out requestId);
 		}
 
 		private void OnDisable()
 		{
-			coordinator.RemoveRequest(requestId);
+			_coordinator.RemoveRequest(requestId);
 		}
 	}
 }

From ff11d27849652713268d7a1be714c259a9539f51 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 16:50:15 +0100
Subject: [PATCH 13/53] Update AddRequest comment

---
 .../VisualPinball.Unity/Sound/MusicCoordinator.cs              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index d57b90975..3e628f64e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -39,9 +39,8 @@ public class MusicCoordinator : MonoBehaviour
 		/// <summary>
 		/// Insert a request into the request stack
 		/// </summary>
-		/// <param name="musicAsset">The requested music</param>
+		/// <param name="request"></param>
 		/// <param name="requestId">A unique identifier that can be used to remove the request later</param>
-		/// <param name="priority">The priority of the request</param>
 		public void AddRequest(MusicRequest request, out int requestId)
 		{
 			request.Index = _requestCounter;

From e50dc5f8a50a6af9dfa8bf1e09194be5de99d717 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 17:31:14 +0100
Subject: [PATCH 14/53] Fix sound effect asset inspector

---
 .../Sound/SoundEffectAssetInspector.cs           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
index c628f1713..fe5e28506 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Threading;
 using UnityEditor;
+using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -39,6 +40,21 @@ public override VisualElement CreateInspectorGUI()
 			root.Add(baseUi);
 			var subUi = _soundEffectAssetInspectorAsset.Instantiate();
 			root.Add(subUi);
+
+			// Hide fade out options when loop is disabled
+			var loopField = subUi.Q<PropertyField>("loop");
+			var fadeInTimeField = subUi.Q<PropertyField>("fade-in-time");
+			var fadeOutTimeField = subUi.Q<PropertyField>("fade-out-time");
+			loopField.RegisterValueChangeCallback(e =>
+			{
+				var loop = e.changedProperty.boolValue;
+				var displayStyle = loop ? DisplayStyle.Flex : DisplayStyle.None;
+				fadeInTimeField.style.display = displayStyle;
+				fadeOutTimeField.style.display = displayStyle;
+			});
+
+			_playButton = subUi.Q<Button>("play-button");
+			_playButton.clicked += OnPlayButtonClicked;
 			return root;
 		}
 

From f3b96e0b04fa919970944756f4c43479bdb382a0 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 17:36:24 +0100
Subject: [PATCH 15/53] Fix looping sound effects

---
 .../VisualPinball.Unity/Sound/SoundEffectAsset.cs                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 2d772c8a1..1455b8d43 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -70,6 +70,7 @@ public override void ConfigureAudioSource(AudioSource audioSource)
 			audioSource.spatialBlend = _type == SoundEffectType.Mechanical ? 1f : 0f;
 			audioSource.volume = UnityEngine.Random.Range(_volumeRange.x, _volumeRange.y);
 			audioSource.pitch = UnityEngine.Random.Range(_pitchRange.x, _pitchRange.y);
+			audioSource.loop = _loop;
 		}
 
 		public async Task Play(

From 4b5a9f93d5a316102306c269fc2f148858b7a41f Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 17:49:53 +0100
Subject: [PATCH 16/53] Add default audio mixer

---
 .../Sound/DefaultVpeAudioMixer.mixer          | 173 ++++++++++++++++++
 .../Sound/DefaultVpeAudioMixer.mixer.meta     |   8 +
 .../Sound/MusicAsset.cs.meta                  |   4 +-
 .../Sound/SoundAsset.cs.meta                  |   3 +-
 .../Sound/SoundEffectAsset.cs.meta            |   4 +-
 .../Sound/VoiceAsset.cs.meta                  |   4 +-
 6 files changed, 192 insertions(+), 4 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
new file mode 100644
index 000000000..2118aba08
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
@@ -0,0 +1,173 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!243 &-6565917931112018152
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Effects
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 23f384cf7e198a748a52e42e210503a2
+  m_Children: []
+  m_Volume: 6a27e933c59229941b94877ddda2a0a4
+  m_Pitch: c71a46cd2225c4e41ba8320e29968bee
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: -4998164517406045731}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &-4998164517406045731
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 539fb8c6eb4f21c4392061ffbff689ab
+  m_EffectName: Attenuation
+  m_MixLevel: bb194f9c22956ef40bb4839d8a12a465
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!243 &-4147333927001089018
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Voice
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 5cc611b5ca08f754c9b4d902bb28443e
+  m_Children: []
+  m_Volume: fe7c035780bfe3e4ea62d42040674206
+  m_Pitch: c999539d98fbb5c4d932f7bbe01155a8
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 546393981669936499}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!243 &-3693297557024079217
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Music
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 661f9122445d74944a32cdf2eabb0acb
+  m_Children: []
+  m_Volume: f60208e2070094348b24113d51660342
+  m_Pitch: e8ee71c35b660474e9f986d7e7d8835a
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 6348350702205789860}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!241 &24100000
+AudioMixerController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DefaultVpeAudioMixer
+  m_OutputGroup: {fileID: 0}
+  m_MasterGroup: {fileID: 24300002}
+  m_Snapshots:
+  - {fileID: 24500006}
+  m_StartSnapshot: {fileID: 24500006}
+  m_SuspendThreshold: -80
+  m_EnableSuspend: 1
+  m_UpdateMode: 0
+  m_ExposedParameters: []
+  m_AudioMixerGroupViews:
+  - guids:
+    - e9d33368c702da24e8c7ef89306a2be6
+    - 23f384cf7e198a748a52e42e210503a2
+    - 661f9122445d74944a32cdf2eabb0acb
+    - 5cc611b5ca08f754c9b4d902bb28443e
+    name: View
+  m_CurrentViewIndex: 0
+  m_TargetSnapshot: {fileID: 24500006}
+--- !u!243 &24300002
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Master
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: e9d33368c702da24e8c7ef89306a2be6
+  m_Children:
+  - {fileID: -6565917931112018152}
+  - {fileID: -3693297557024079217}
+  - {fileID: -4147333927001089018}
+  m_Volume: 718a4a34fcd499340903b310278e884f
+  m_Pitch: 54892ee14efaf92498a6ca9506fab7ed
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 24400004}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &24400004
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 36a42f013a30d8646ada1b5ec4c7c50a
+  m_EffectName: Attenuation
+  m_MixLevel: ccc7dc24eeb7a9b43aac741d069d671f
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!245 &24500006
+AudioMixerSnapshotController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Snapshot
+  m_AudioMixer: {fileID: 24100000}
+  m_SnapshotID: 6d896a4b315f9994d91e85396c144f61
+  m_FloatValues: {}
+  m_TransitionOverrides: {}
+--- !u!244 &546393981669936499
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: d251172e994b9d84ab4ff04543649f1a
+  m_EffectName: Attenuation
+  m_MixLevel: b54aaff025b8094428f62d49d1b8850f
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!244 &6348350702205789860
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: a9694ec9f4fdbad458656ad4b7632674
+  m_EffectName: Attenuation
+  m_MixLevel: 714dabe95f9ce1d4a94e3162f032ea9f
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer.meta
new file mode 100644
index 000000000..e200b01b2
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9784dda595e200a4dbef54316a45f16e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 24100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta
index 998d494e9..38b82c8cb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs.meta
@@ -3,7 +3,9 @@ guid: 3da6cef59ec67434e894090e6eda4c04
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _audioMixerGroup: {fileID: -3693297557024079217, guid: 9784dda595e200a4dbef54316a45f16e,
+      type: 2}
   executionOrder: 0
   icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs.meta
index 69d638dc9..e67af3d04 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs.meta
@@ -3,7 +3,8 @@ guid: 8a6287696a5efed489f573445fda4418
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _audioMixerGroup: {fileID: 24300002, guid: 9784dda595e200a4dbef54316a45f16e, type: 2}
   executionOrder: 0
   icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta
index 7664ba0a0..69ae5d81e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs.meta
@@ -3,7 +3,9 @@ guid: 6e0ad37c5157a844b9026bfcfe140656
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _audioMixerGroup: {fileID: -6565917931112018152, guid: 9784dda595e200a4dbef54316a45f16e,
+      type: 2}
   executionOrder: 0
   icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta
index ffdc6989d..0bfe7b7ac 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta
@@ -3,7 +3,9 @@ guid: 2cfd1a7f71a6fab4a911f6c735c4a8b9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _audioMixerGroup: {fileID: -4147333927001089018, guid: 9784dda595e200a4dbef54316a45f16e,
+      type: 2}
   executionOrder: 0
   icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 

From 4d55f6238e4e9fd1f7d4a5e88a92419116b4bd4e Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 17:51:59 +0100
Subject: [PATCH 17/53] Set default volume of music assets to 1

---
 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index bbb8ecb55..b509e874d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -30,6 +30,6 @@ public class MusicAsset : SoundAsset
 
 		[SerializeField]
 		[Range(0f, 1f)]
-		private float _volume;
+		private float _volume = 1f;
 	}
 }

From 14ead5e7bb711a518b6817b7a92a5f1f7b5fa042 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 19:25:37 +0100
Subject: [PATCH 18/53] Add ducking to audio mixer

---
 .../Sound/DefaultVpeAudioMixer.mixer          | 112 +++++++++++++++++-
 1 file changed, 111 insertions(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
index 2118aba08..78912ea71 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
@@ -1,5 +1,49 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!244 &-8334109828346926041
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: eff2428ece60eda48a80a6a8abc3ff22
+  m_EffectName: Duck Volume
+  m_MixLevel: 54f3073382b8eae4b8f3611ed6782f31
+  m_Parameters:
+  - m_ParameterName: Threshold
+    m_GUID: 791e6d41fd93e50498fe331c0f888638
+  - m_ParameterName: Ratio
+    m_GUID: 90682c3f69ae7d54f93dba39c472609f
+  - m_ParameterName: Attack Time
+    m_GUID: b7f39c2fa2fc4c44f8b8cad505929ef2
+  - m_ParameterName: Release Time
+    m_GUID: e07e994de202e2c44a70456afe9ab8cf
+  - m_ParameterName: Make-up Gain
+    m_GUID: 92d7353fcaa43214ab3a7a17a9cb1b3c
+  - m_ParameterName: Knee
+    m_GUID: 4fa0d37fae8be3046813cde49a55748b
+  - m_ParameterName: Sidechain Mix
+    m_GUID: 48ef743385cff1446bf6029dab3acc34
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!244 &-8116594623855882042
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: b1314cd09a7eacb4fa6f674040de19f8
+  m_EffectName: Highpass Simple
+  m_MixLevel: cf405d8e3e744304e8886e4ff753f06a
+  m_Parameters:
+  - m_ParameterName: Cutoff freq
+    m_GUID: 21aa5fdf1126d754c85525d781f5911d
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!243 &-6565917931112018152
 AudioMixerGroupController:
   m_ObjectHideFlags: 0
@@ -15,10 +59,25 @@ AudioMixerGroupController:
   m_Send: 00000000000000000000000000000000
   m_Effects:
   - {fileID: -4998164517406045731}
+  - {fileID: -4979870985345707829}
   m_UserColorIndex: 0
   m_Mute: 0
   m_Solo: 0
   m_BypassEffects: 0
+--- !u!244 &-5853359535173080414
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 13131384fccd6914683e386f11912549
+  m_EffectName: Send
+  m_MixLevel: 638bcdf758f780744a31aef9bb9d62c4
+  m_Parameters: []
+  m_SendTarget: {fileID: -8334109828346926041}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!244 &-4998164517406045731
 AudioMixerEffectController:
   m_ObjectHideFlags: 3
@@ -33,6 +92,48 @@ AudioMixerEffectController:
   m_SendTarget: {fileID: 0}
   m_EnableWetMix: 0
   m_Bypass: 0
+--- !u!244 &-4979870985345707829
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 9ab6dbb8d758fa648a4dbf13c0bc748a
+  m_EffectName: Duck Volume
+  m_MixLevel: 01710c5afdf94b042acf83df011e3871
+  m_Parameters:
+  - m_ParameterName: Threshold
+    m_GUID: bd53ab0324170e94b807b825561c37ce
+  - m_ParameterName: Ratio
+    m_GUID: 12b212671de5c914690c37d68ce06e2f
+  - m_ParameterName: Attack Time
+    m_GUID: 2dd6fb49c7b872d48b20a7619f23db15
+  - m_ParameterName: Release Time
+    m_GUID: d877af337bea54041ae4ce9539309da8
+  - m_ParameterName: Make-up Gain
+    m_GUID: 15774c43089dd1c44aef03587d2e13c2
+  - m_ParameterName: Knee
+    m_GUID: f644c84e4b97f424eba94d8d1e1429f2
+  - m_ParameterName: Sidechain Mix
+    m_GUID: d069a153acddcf245a0c83222444f4da
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!244 &-4784353138324999412
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: c2828ff4de248fe4aa8aac8722518a03
+  m_EffectName: Send
+  m_MixLevel: c22ab7d1f1e5599489ea086ff4e8261f
+  m_Parameters: []
+  m_SendTarget: {fileID: -4979870985345707829}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!243 &-4147333927001089018
 AudioMixerGroupController:
   m_ObjectHideFlags: 0
@@ -48,6 +149,8 @@ AudioMixerGroupController:
   m_Send: 00000000000000000000000000000000
   m_Effects:
   - {fileID: 546393981669936499}
+  - {fileID: -4784353138324999412}
+  - {fileID: -5853359535173080414}
   m_UserColorIndex: 0
   m_Mute: 0
   m_Solo: 0
@@ -67,6 +170,7 @@ AudioMixerGroupController:
   m_Send: 00000000000000000000000000000000
   m_Effects:
   - {fileID: 6348350702205789860}
+  - {fileID: -8334109828346926041}
   m_UserColorIndex: 0
   m_Mute: 0
   m_Solo: 0
@@ -141,7 +245,13 @@ AudioMixerSnapshotController:
   m_Name: Snapshot
   m_AudioMixer: {fileID: 24100000}
   m_SnapshotID: 6d896a4b315f9994d91e85396c144f61
-  m_FloatValues: {}
+  m_FloatValues:
+    791e6d41fd93e50498fe331c0f888638: -60
+    c22ab7d1f1e5599489ea086ff4e8261f: 0
+    638bcdf758f780744a31aef9bb9d62c4: 0
+    b7f39c2fa2fc4c44f8b8cad505929ef2: 0.8
+    90682c3f69ae7d54f93dba39c472609f: 2.5
+    4fa0d37fae8be3046813cde49a55748b: 30
   m_TransitionOverrides: {}
 --- !u!244 &546393981669936499
 AudioMixerEffectController:

From 0b069498d15a2081d4dfe631dbc62b461e90a90b Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 20:08:25 +0100
Subject: [PATCH 19/53] Change audio ducking parameters

---
 .../VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
index 78912ea71..abf1e43d3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
@@ -248,9 +248,12 @@ AudioMixerSnapshotController:
   m_FloatValues:
     791e6d41fd93e50498fe331c0f888638: -60
     c22ab7d1f1e5599489ea086ff4e8261f: 0
+    bd53ab0324170e94b807b825561c37ce: -60
     638bcdf758f780744a31aef9bb9d62c4: 0
+    2dd6fb49c7b872d48b20a7619f23db15: 0.3
+    f644c84e4b97f424eba94d8d1e1429f2: 30
     b7f39c2fa2fc4c44f8b8cad505929ef2: 0.8
-    90682c3f69ae7d54f93dba39c472609f: 2.5
+    90682c3f69ae7d54f93dba39c472609f: 2
     4fa0d37fae8be3046813cde49a55748b: 30
   m_TransitionOverrides: {}
 --- !u!244 &546393981669936499

From 0232daa99a5b76e8e0780cad0524ad766bd7ebff Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 20:09:18 +0100
Subject: [PATCH 20/53] Move sound cooldown from component to asset

---
 .../Sound/SoundEffectAssetInspector.uxml      |  1 +
 .../Sound/SoundEffectAsset.cs                 | 24 +++++++++++++++++++
 .../Sound/SoundEffectComponent.cs             | 12 ----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
index 77928c6a9..393083105 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
@@ -5,5 +5,6 @@
     <uie:PropertyField name="fade-out-time" binding-path="_fadeOutTime" label="Fade Out Time" />
     <ui:MinMaxSlider label="Volume Range" min-value="1" max-value="1" low-limit="0" high-limit="1" tooltip="Volume will be randomized within this range (0 - 1)" binding-path="_volumeRange" name="volume-range" class="unity-base-field__aligned" />
     <ui:MinMaxSlider label="Pitch Range" min-value="1" max-value="1" low-limit="0.5" high-limit="1.5" binding-path="_pitchRange" name="pitch-range" tooltip="Pitch will be randomized within this range (0.5 - 1.5)" class="unity-base-field__aligned" />
+    <uie:PropertyField binding-path="_cooldown" label="Cooldown" tooltip="If this sound effect is triggered again before this number of seconds passes, it will not be played. This is to prevent sound effects from playing twice at the same time, for example when the ball hits two drop targets at once." />
     <ui:Button text="Play" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="false" name="play-button" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 1455b8d43..3bb7a2261 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -17,8 +17,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using Logger = NLog.Logger;
 #if UNITY_EDITOR
 using UnityEditor;
 using UnityEditor.SceneManagement;
@@ -64,6 +66,14 @@ public class SoundEffectAsset : SoundAsset
 		[SerializeField, Range(0, 10f)]
 		private float _fadeOutTime;
 
+		[SerializeField, Range(0, 0.2f)]
+		private float _cooldown = 0.02f;
+
+		[NonSerialized]
+		private float _lastPlayStartTime = float.NegativeInfinity;
+
+		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
 		public override void ConfigureAudioSource(AudioSource audioSource)
 		{
 			base.ConfigureAudioSource(audioSource);
@@ -80,6 +90,20 @@ public async Task Play(
 			float volume = 1f
 		)
 		{
+			float timeSinceLastPlay = Time.unscaledTime - _lastPlayStartTime;
+			if (timeSinceLastPlay < _cooldown)
+			{
+				Logger.Warn(
+					$"Will not play sound effect '{name}' because the time since last play is "
+						+ $"{timeSinceLastPlay} seconds, which is less than the cooldown of "
+						+ $"{_cooldown} seconds. If this is not intended by the table author, they "
+						+ $"should lower the '{nameof(_cooldown)}' parameter in the sound effect "
+						+ "asset inspector."
+				);
+				return;
+			}
+
+			_lastPlayStartTime = Time.unscaledTime;
 			var audioSource = audioObj.AddComponent<AudioSource>();
 
 			try
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
index a3d129ea6..8a9106f7b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
@@ -41,7 +41,6 @@ public class SoundEffectComponent : EnableAfterAwakeComponent
 
 		private CancellationTokenSource _instantCts;
 		private CancellationTokenSource _allowFadeCts;
-		private float _lastPlayStartTime = float.NegativeInfinity;
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
 		protected override void OnEnableAfterAfterAwake()
@@ -72,22 +71,11 @@ public async Task Play()
 				Logger.Warn("Cannot play without sound asset. Assign it in the inspector.");
 				return;
 			}
-			float timeSinceLastPlay = Time.unscaledTime - _lastPlayStartTime;
-			if (timeSinceLastPlay < 0.01f)
-			{
-				Logger.Warn(
-					$"Sound spam protection engaged. Time since last play was less than "
-						+ $"0.01 seconds ({timeSinceLastPlay}). There is probably something wrong with "
-						+ $"the calling code."
-				);
-				return;
-			}
 
 			if (_interrupt) {
 				Stop(allowFade: true);
 			try
 			{
-				_lastPlayStartTime = Time.unscaledTime;
 				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
 			}
 			catch (OperationCanceledException) { }

From d8c2188775714ac52c7985db0125dbe24139e594 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Wed, 12 Feb 2025 22:05:07 +0100
Subject: [PATCH 21/53] Correct comments

---
 .../VisualPinball.Unity/Sound/CalloutRequester.cs        | 9 ++++++---
 .../VisualPinball.Unity/Sound/MusicRequest.cs            | 2 +-
 .../VisualPinball.Unity/Sound/MusicRequester.cs          | 3 +++
 .../VisualPinball.Unity/Sound/SoundEffectAsset.cs        | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
index 146de0f36..b577bd42e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
@@ -18,16 +18,19 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Requests a callout from the callout coordinator when enabled. Intended for testing.
+	/// </summary>
 	public class CalloutRequester : MonoBehaviour
 	{
 		[SerializeField]
-		private VoiceAsset _voiceAsset;
+		private CalloutCoordinator _coordinator;
 
 		[SerializeField]
-		private SoundPriority _priority = SoundPriority.Medium;
+		private VoiceAsset _voiceAsset;
 
 		[SerializeField]
-		private CalloutCoordinator _coordinator;
+		private SoundPriority _priority = SoundPriority.Medium;
 
 		[SerializeField]
 		private float _maxQueueTime = -1f;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index 8a3cdb8c3..13dda2845 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -33,7 +33,7 @@ public MusicRequest(MusicAsset musicAsset, SoundPriority priority = SoundPriorit
 		/// <summary>
 		/// The <c>MusicCoordinator</c> sets the <c>Index</c> of the <c>n</c>th request it receives
 		/// to <c>n</c>. This allows sorting requests by receive order and uniquely identifies each
-		/// request so it can be removed later usinig its <c>Index</c>.
+		/// request so it can be removed later using its <c>Index</c>.
 		/// </summary>
 		public int Index { get; set; }
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
index 1baff4834..4257b41bb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -18,6 +18,9 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Requests music from the music coordinator while enabled. Intended for testing.
+	/// </summary>
 	public class MusicRequester : MonoBehaviour
 	{
 		[SerializeField]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 3bb7a2261..24a3fc9b5 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -37,7 +37,7 @@ public enum SoundEffectType
 	/// <summary>
 	/// Represents a reusable collection of similar sounds, for example different samples of a
 	/// flipper mechanism getting triggered. Supports randomizing pitch and volume to introduce
-	/// variation.
+	/// variation. Supports looping sounds with optional fade.
 	/// </summary>
 	[CreateAssetMenu(
 		fileName = "Sound Effect",

From 9bde265a74bebb830a364e7ee865ef3fb7b723a7 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:15:37 +0100
Subject: [PATCH 22/53] Destroy music player when audio source destroyed

---
 .../VisualPinball.Unity/Sound/MusicPlayer.cs                | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index 694251513..bdab661c3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -45,6 +45,12 @@ private void Start()
 
 		private void Update()
 		{
+			if (_audioSource == null)
+			{
+				Destroy(this);
+				return;
+			}
+
 			var canPlay = _audioSource.isActiveAndEnabled;
 #if UNITY_EDITOR
 			canPlay &= EditorApplication.isFocused;

From 214be64ac6508874c49d78fed0131a598d6816eb Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:54:48 +0100
Subject: [PATCH 23/53] Add music and callout coordinators during import

---
 .../Import/VpxSceneConverter.cs                           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs
index 6c6d9b250..87f41ed4e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs
@@ -163,6 +163,8 @@ public GameObject Convert(bool applyPatch = true, string tableName = null)
 
 			ConfigurePlayer(componentLookup);
 
+			SetUpAudio();
+
 			// patch
 			if (_applyPatch) {
 				_patcher?.PostPatch(_tableGo);
@@ -523,6 +525,12 @@ private void CreateTrough(Dictionary<string, IMainComponent> components)
 			InstantiateAndPersistPrefab(item, components);
 		}
 
+		private void SetUpAudio()
+		{
+			_tableGo.AddComponent<CalloutCoordinator>();
+			_tableGo.AddComponent<MusicCoordinator>();
+		}
+
 		private void CreateFileHierarchy()
 		{
 			if (!Directory.Exists("Assets/Tables/")) {

From 21a8b59cd1240e6a47f9cbe9b630a3143c87fe89 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:55:26 +0100
Subject: [PATCH 24/53] Set default pause on callout coordinator

---
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index c0f01ad15..587325a56 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -27,7 +27,7 @@ public class CalloutCoordinator : MonoBehaviour
 		[SerializeField]
 		[Range(0f, 3f)]
 		[Tooltip("How many seconds to pause after a callout before the next one can be started")]
-		private float _pauseDuration;
+		private float _pauseDuration = 0.5f;
 
 		private readonly List<CalloutRequest> _calloutQ = new();
 		private CancellationTokenSource _loopCts;

From 1f9937cbba2d4ae925c11ce7c940e383c0f4fa90 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:02:25 +0100
Subject: [PATCH 25/53] Assign icons to audio scripts

---
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta        | 2 +-
 .../VisualPinball.Unity/Sound/CalloutRequest.cs.meta            | 2 +-
 .../VisualPinball.Unity/Sound/CalloutRequester.cs.meta          | 2 +-
 .../VisualPinball.Unity/Sound/MusicCoordinator.cs.meta          | 2 +-
 .../VisualPinball.Unity/Sound/MusicPlayer.cs.meta               | 2 +-
 .../VisualPinball.Unity/Sound/MusicRequester.cs.meta            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta
index e6128bac4..739362f58 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 2a19a503f9b847f42bfcd456ec56f4b9, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta
index 908c5314c..65bec5c1c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 2a19a503f9b847f42bfcd456ec56f4b9, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta
index 78fb48c59..db06aa620 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 2a19a503f9b847f42bfcd456ec56f4b9, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta
index 784e8214a..95b38ce27 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
index b3d8b947f..95f7c5121 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta
index 7fab37218..f773612b1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 22fa0f3254800a748abe0d6b46930179, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

From 2aefb3051a33a9f6a97e1aa6eb5da80099adc0f4 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:17:37 +0100
Subject: [PATCH 26/53] Add comments

---
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs          | 4 ++++
 .../VisualPinball.Unity/Sound/CalloutRequest.cs              | 3 +++
 .../VisualPinball.Unity/Sound/MusicCoordinator.cs            | 5 +++++
 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs | 5 +++++
 .../VisualPinball.Unity/Sound/MusicRequest.cs                | 4 ++++
 5 files changed, 21 insertions(+)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index 587325a56..d219e67d5 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -22,6 +22,10 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Manages playback of callouts. Maintains a queue of callout requests. Supports prioritizing
+	/// certain callouts over others and enforcing a minimum pause between two callouts.
+	/// </summary>
 	public class CalloutCoordinator : MonoBehaviour
 	{
 		[SerializeField]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
index 135f7d5d0..4f71ee098 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
@@ -20,6 +20,9 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Used to request from <c>CalloutCoordinator</c> to play a callout.
+	/// </summary>
 	public struct CalloutRequest
 	{
 		public SoundPriority Priority { get; private set; }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index 3e628f64e..efec60599 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -23,6 +23,11 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Manages music playback using a stack. Other scripts can add requests to the stack.
+	/// The stack is sorted based on priority and age of the requests. The topmost request is
+	/// played. Music fades out when stopped. New music fades in if other music is playing.
+	/// </summary>
 	public class MusicCoordinator : MonoBehaviour
 	{
 		[Tooltip("How many seconds should transitions between songs take?")]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index bdab661c3..c075e265e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -21,6 +21,11 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Manages the playback of a single music asset according to the <c>ShouldPlay</c> property
+	/// controlled by <c>MusicCoordinator</c>. Always fades towards the desired state, unless
+	/// <c>StartAtFullVolume</c> is true when starting.
+	/// </summary>
 	public class MusicPlayer : MonoBehaviour
 	{
 		public bool ShouldPlay { get; set; }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index 13dda2845..a29ab3744 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -18,6 +18,10 @@
 
 namespace VisualPinball.Unity
 {
+	/// <summary>
+	/// Used to request from <c>MusicCoordinator</c> to play a <c>MusicAsset</c>. Supports sorting
+	/// to decide which request is played first.
+	/// </summary>
 	public struct MusicRequest : IComparable<MusicRequest>
 	{
 		public MusicRequest(MusicAsset musicAsset, SoundPriority priority = SoundPriority.Medium)

From a8ecaec83989211516ab87e6dac26b1bfeb49613 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:18:17 +0100
Subject: [PATCH 27/53] Make MusicRequest.CompareTo readonly

---
 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index a29ab3744..a69ea1065 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -42,7 +42,7 @@ public MusicRequest(MusicAsset musicAsset, SoundPriority priority = SoundPriorit
 		public int Index { get; set; }
 
 		// Used to sort the request stack to determine which request to play
-		public int CompareTo(MusicRequest other)
+		public readonly int CompareTo(MusicRequest other)
 		{
 			if (Priority != other.Priority)
 				return other.Priority.CompareTo(Priority);

From eb581cdfb07a566b67a42a69ff0cddd8a09291f9 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:20:27 +0100
Subject: [PATCH 28/53] Get music and callout coordinators in parents

---
 .../VisualPinball.Unity/Sound/CalloutRequester.cs           | 6 +++---
 .../VisualPinball.Unity/Sound/MusicRequester.cs             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
index b577bd42e..f1a84ac66 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
@@ -23,9 +23,6 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public class CalloutRequester : MonoBehaviour
 	{
-		[SerializeField]
-		private CalloutCoordinator _coordinator;
-
 		[SerializeField]
 		private VoiceAsset _voiceAsset;
 
@@ -35,9 +32,12 @@ public class CalloutRequester : MonoBehaviour
 		[SerializeField]
 		private float _maxQueueTime = -1f;
 
+		private CalloutCoordinator _coordinator;
+
 		private void OnEnable()
 		{
 			var request = new CalloutRequest(_voiceAsset, _priority, _maxQueueTime);
+			_coordinator = GetComponentInParent<CalloutCoordinator>();
 			_coordinator.EnqueueCallout(request);
 		}
 	}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
index 4257b41bb..ad3e69e1d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -23,9 +23,6 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public class MusicRequester : MonoBehaviour
 	{
-		[SerializeField]
-		private MusicCoordinator _coordinator;
-
 		[SerializeField]
 		private MusicAsset _musicAsset;
 
@@ -34,9 +31,12 @@ public class MusicRequester : MonoBehaviour
 
 		private int requestId;
 
+		private MusicCoordinator _coordinator;
+
 		private void OnEnable()
 		{
 			var request = new MusicRequest(_musicAsset, _priority);
+			_coordinator = GetComponentInParent<MusicCoordinator>();
 			_coordinator.AddRequest(request, out requestId);
 		}
 

From 2c7a7a64ab09f9694d31cc666622c5fd771cad23 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:21:18 +0100
Subject: [PATCH 29/53] Create new game objects for music and callouts

---
 .../Sound/CalloutCoordinator.cs                | 18 +++++++++++++++++-
 .../Sound/CalloutRequest.cs                    |  6 +++---
 .../Sound/MusicCoordinator.cs                  | 16 ++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index d219e67d5..fe410a020 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -80,9 +80,25 @@ private async Task CalloutLoop(CancellationToken ct)
 
 				var callout = _calloutQ[0];
 				_calloutQ.RemoveAt(0);
-				await callout.Play(gameObject, ct);
+				var calloutGo = GetCalloutGameObject(callout.VoiceAsset.name);
+				await callout.Play(calloutGo, ct);
 				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
 			}
 		}
+
+		private GameObject GetCalloutGameObject(string calloutName)
+		{
+			const string calloutsGoName = "Callouts";
+			var calloutsParent = transform.Find(calloutsGoName);
+			if (calloutsParent == null)
+			{
+				calloutsParent = new GameObject(calloutsGoName).transform;
+				calloutsParent.SetParent(transform, false);
+			}
+
+			var calloutGo = new GameObject(calloutName);
+			calloutGo.transform.SetParent(calloutsParent, false);
+			return calloutGo;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
index 4f71ee098..da28df679 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
@@ -27,7 +27,7 @@ public struct CalloutRequest
 	{
 		public SoundPriority Priority { get; private set; }
 
-		private readonly VoiceAsset _voiceAsset;
+		public readonly VoiceAsset VoiceAsset;
 		private readonly float _deadline;
 
 		/// <summary>
@@ -42,7 +42,7 @@ public CalloutRequest(
 			float maxQueueTime = -1f
 		)
 		{
-			_voiceAsset = voiceAsset;
+			VoiceAsset = voiceAsset;
 			Priority = priority;
 			if (maxQueueTime != -1f)
 				_deadline = Time.time + maxQueueTime;
@@ -58,6 +58,6 @@ public readonly bool IsExpired()
 		}
 
 		public readonly async Task Play(GameObject audioObj, CancellationToken ct) =>
-			await _voiceAsset.Play(audioObj, ct);
+			await VoiceAsset.Play(audioObj, ct);
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index efec60599..0a3d40a63 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -84,6 +84,7 @@ private void EvaluateRequestStack()
 				var playerToPlay = _players.FirstOrDefault(x => x.MusicAsset == musicToPlay);
 				if (playerToPlay == default)
 				{
+					var musicGo = GetMusicGameObject(musicToPlay.name);
 					playerToPlay = gameObject.AddComponent<MusicPlayer>();
 					playerToPlay.Init(musicToPlay, _fadeDuration);
 					_players.Add(playerToPlay);
@@ -96,5 +97,20 @@ private void EvaluateRequestStack()
 			else
 				_players.ForEach(x => x.ShouldPlay = false);
 		}
+
+		private GameObject GetMusicGameObject(string musicName)
+		{
+			const string musicGoName = "Music";
+			var musicParent = transform.Find(musicGoName);
+			if (musicParent == null)
+			{
+				musicParent = new GameObject(musicGoName).transform;
+				musicParent.SetParent(transform, false);
+			}
+
+			var musicGo = new GameObject(musicName);
+			musicGo.transform.SetParent(musicParent, false);
+			return musicGo;
+		}
 	}
 }

From a89fe0445f7facb586f46e7488601e6363e99821 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:42:58 +0100
Subject: [PATCH 30/53] Set correct parent object for music player

---
 .../VisualPinball.Unity/Sound/MusicCoordinator.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index 0a3d40a63..d3178866d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -85,7 +85,7 @@ private void EvaluateRequestStack()
 				if (playerToPlay == default)
 				{
 					var musicGo = GetMusicGameObject(musicToPlay.name);
-					playerToPlay = gameObject.AddComponent<MusicPlayer>();
+					playerToPlay = musicGo.AddComponent<MusicPlayer>();
 					playerToPlay.Init(musicToPlay, _fadeDuration);
 					_players.Add(playerToPlay);
 				}

From c9887fd0766887c91892e4436b52f7eb9d1b2976 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:50:07 +0100
Subject: [PATCH 31/53] Use single game object for callouts

---
 .../Sound/CalloutCoordinator.cs               | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index fe410a020..679bccd2e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -80,25 +80,24 @@ private async Task CalloutLoop(CancellationToken ct)
 
 				var callout = _calloutQ[0];
 				_calloutQ.RemoveAt(0);
-				var calloutGo = GetCalloutGameObject(callout.VoiceAsset.name);
+				var calloutGo = GetCalloutGameObject();
 				await callout.Play(calloutGo, ct);
+				Destroy(calloutGo);
 				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
 			}
 		}
 
-		private GameObject GetCalloutGameObject(string calloutName)
+		private GameObject GetCalloutGameObject()
 		{
-			const string calloutsGoName = "Callouts";
-			var calloutsParent = transform.Find(calloutsGoName);
-			if (calloutsParent == null)
+			const string calloutsGoName = "Callout";
+			var calloutTransform = transform.Find(calloutsGoName);
+			if (calloutTransform == null)
 			{
-				calloutsParent = new GameObject(calloutsGoName).transform;
-				calloutsParent.SetParent(transform, false);
+				calloutTransform = new GameObject(calloutsGoName).transform;
+				calloutTransform.SetParent(transform, false);
 			}
 
-			var calloutGo = new GameObject(calloutName);
-			calloutGo.transform.SetParent(calloutsParent, false);
-			return calloutGo;
+			return calloutTransform.gameObject;
 		}
 	}
 }

From 1bf2465269d94ac59849dff7d74a7846274138b8 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:20:41 +0100
Subject: [PATCH 32/53] Destroy music game objects when finished

---
 .../Sound/MusicCoordinator.cs                 |  6 ++++-
 .../VisualPinball.Unity/Sound/MusicPlayer.cs  | 22 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index d3178866d..fa2658bf9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -86,7 +86,11 @@ private void EvaluateRequestStack()
 				{
 					var musicGo = GetMusicGameObject(musicToPlay.name);
 					playerToPlay = musicGo.AddComponent<MusicPlayer>();
-					playerToPlay.Init(musicToPlay, _fadeDuration);
+					playerToPlay.Init(
+						musicToPlay,
+						_fadeDuration,
+						MusicPlayer.AfterStopAction.DeleteGameObject
+					);
 					_players.Add(playerToPlay);
 				}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index c075e265e..e1882d796 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -28,6 +28,13 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public class MusicPlayer : MonoBehaviour
 	{
+		public enum AfterStopAction
+		{
+			None,
+			DeleteSelf,
+			DeleteGameObject,
+		}
+
 		public bool ShouldPlay { get; set; }
 		public bool IsPlaying => _audioSource != null && _audioSource.isPlaying;
 		public bool StartAtFullVolume { get; set; }
@@ -35,11 +42,13 @@ public class MusicPlayer : MonoBehaviour
 
 		private AudioSource _audioSource;
 		private float _fadeDuration;
+		private AfterStopAction _afterStopAction;
 
-		public void Init(MusicAsset musicAsset, float fadeDuration)
+		public void Init(MusicAsset musicAsset, float fadeDuration, AfterStopAction afterStopAction)
 		{
 			MusicAsset = musicAsset;
 			_fadeDuration = fadeDuration;
+			_afterStopAction = afterStopAction;
 		}
 
 		private void Start()
@@ -72,6 +81,17 @@ private void Update()
 			else if (!ShouldPlay && _audioSource.isPlaying && _audioSource.volume == 0f)
 			{
 				_audioSource.Stop();
+				switch (_afterStopAction)
+				{
+					case AfterStopAction.None:
+						break;
+					case AfterStopAction.DeleteSelf:
+						Destroy(this);
+						break;
+					case AfterStopAction.DeleteGameObject:
+						Destroy(gameObject);
+						break;
+				}
 			}
 
 			var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;

From c26fc69ccfe9aca27499d1c22c3582ef91515dea Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:27:22 +0100
Subject: [PATCH 33/53] Set name of callout game object to callout name

---
 .../Sound/CalloutCoordinator.cs                 | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index 679bccd2e..d7f0f51ba 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -80,24 +80,19 @@ private async Task CalloutLoop(CancellationToken ct)
 
 				var callout = _calloutQ[0];
 				_calloutQ.RemoveAt(0);
-				var calloutGo = GetCalloutGameObject();
+				var calloutGo = GetCalloutGameObject(callout.VoiceAsset.name);
 				await callout.Play(calloutGo, ct);
 				Destroy(calloutGo);
 				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
 			}
 		}
 
-		private GameObject GetCalloutGameObject()
+		private GameObject GetCalloutGameObject(string calloutName)
 		{
-			const string calloutsGoName = "Callout";
-			var calloutTransform = transform.Find(calloutsGoName);
-			if (calloutTransform == null)
-			{
-				calloutTransform = new GameObject(calloutsGoName).transform;
-				calloutTransform.SetParent(transform, false);
-			}
-
-			return calloutTransform.gameObject;
+			var calloutsGoName = $"Callout: {calloutName}";
+			var calloutGo = new GameObject(calloutsGoName);
+			calloutGo.transform.SetParent(transform, false);
+			return calloutGo;
 		}
 	}
 }

From f189e7733f6731941da041754f20fea60495b41b Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:30:29 +0100
Subject: [PATCH 34/53] Remove spaces from default file names

---
 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs   | 4 ++--
 .../VisualPinball.Unity/Sound/SoundEffectAsset.cs             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index b509e874d..0504360e7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -20,8 +20,8 @@
 namespace VisualPinball.Unity
 {
 	[CreateAssetMenu(
-		fileName = "Music Asset",
-		menuName = "Visual Pinball/Sound/Music Asset",
+		fileName = "MusicAsset",
+		menuName = "Visual Pinball/Sound/MusicAsset",
 		order = 102
 	)]
 	public class MusicAsset : SoundAsset
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 24a3fc9b5..9a0fbc6cf 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -40,8 +40,8 @@ public enum SoundEffectType
 	/// variation. Supports looping sounds with optional fade.
 	/// </summary>
 	[CreateAssetMenu(
-		fileName = "Sound Effect",
-		menuName = "Visual Pinball/Sound/Sound Effect Asset",
+		fileName = "SoundEffect",
+		menuName = "Visual Pinball/Sound/SoundEffectAsset",
 		order = 102
 	)]
 	public class SoundEffectAsset : SoundAsset

From 00a9342d980061ac6f6212ec9c4a078d9f12f336 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:34:52 +0100
Subject: [PATCH 35/53] Rename all voice things to callout

---
 .../Sound/VoiceAssetInspector.cs                       |  2 +-
 .../Sound/{VoiceAsset.cs => CalloutAsset.cs}           |  6 +++---
 .../Sound/{VoiceAsset.cs.meta => CalloutAsset.cs.meta} |  0
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs    |  2 +-
 .../VisualPinball.Unity/Sound/CalloutRequest.cs        | 10 +++++-----
 .../VisualPinball.Unity/Sound/CalloutRequester.cs      |  4 ++--
 .../Sound/DefaultVpeAudioMixer.mixer                   |  2 +-
 .../VisualPinball.Unity/Sound/SoundAsset.cs            |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename VisualPinball.Unity/VisualPinball.Unity/Sound/{VoiceAsset.cs => CalloutAsset.cs} (91%)
 rename VisualPinball.Unity/VisualPinball.Unity/Sound/{VoiceAsset.cs.meta => CalloutAsset.cs.meta} (100%)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
index cdead9cb2..f4eac44a4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
@@ -20,7 +20,7 @@
 
 namespace VisualPinball.Unity.Editor
 {
-	[CustomEditor(typeof(VoiceAsset)), CanEditMultipleObjects]
+	[CustomEditor(typeof(CalloutAsset)), CanEditMultipleObjects]
 	public class VoiceAssetInspector : SoundAssetInspector
 	{
 		[SerializeField]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
similarity index 91%
rename from VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
rename to VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index 90e1fc5f9..5e007ef29 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -21,11 +21,11 @@
 namespace VisualPinball.Unity
 {
 	[CreateAssetMenu(
-		fileName = "Voice Asset",
-		menuName = "Visual Pinball/Sound/Voice Asset",
+		fileName = "CalloutAsset",
+		menuName = "Visual Pinball/Sound/CalloutAsset",
 		order = 102
 	)]
-	public class VoiceAsset : SoundAsset
+	public class CalloutAsset : SoundAsset
 	{
 		public async Task Play(GameObject audioObj, CancellationToken ct)
 		{
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity/Sound/VoiceAsset.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index d7f0f51ba..aa13997e3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -80,7 +80,7 @@ private async Task CalloutLoop(CancellationToken ct)
 
 				var callout = _calloutQ[0];
 				_calloutQ.RemoveAt(0);
-				var calloutGo = GetCalloutGameObject(callout.VoiceAsset.name);
+				var calloutGo = GetCalloutGameObject(callout.CalloutAsset.name);
 				await callout.Play(calloutGo, ct);
 				Destroy(calloutGo);
 				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
index da28df679..55ed3bf9d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
@@ -27,22 +27,22 @@ public struct CalloutRequest
 	{
 		public SoundPriority Priority { get; private set; }
 
-		public readonly VoiceAsset VoiceAsset;
+		public readonly CalloutAsset CalloutAsset;
 		private readonly float _deadline;
 
 		/// <summary>
 		/// Create a callout
 		/// </summary>
-		/// <param name="voiceAsset">The voice asset to play</param>
+		/// <param name="calloutAsset">The callout asset to play</param>
 		/// <param name="priority">Higher priority callouts will play before lower priority ones</param>
 		/// <param name="maxQueueTime">How many seconds to wait in the queue before discarding the request. -1 = no limit</param>
 		public CalloutRequest(
-			VoiceAsset voiceAsset,
+			CalloutAsset calloutAsset,
 			SoundPriority priority,
 			float maxQueueTime = -1f
 		)
 		{
-			VoiceAsset = voiceAsset;
+			CalloutAsset = calloutAsset;
 			Priority = priority;
 			if (maxQueueTime != -1f)
 				_deadline = Time.time + maxQueueTime;
@@ -58,6 +58,6 @@ public readonly bool IsExpired()
 		}
 
 		public readonly async Task Play(GameObject audioObj, CancellationToken ct) =>
-			await VoiceAsset.Play(audioObj, ct);
+			await CalloutAsset.Play(audioObj, ct);
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
index f1a84ac66..7e23020ae 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
@@ -24,7 +24,7 @@ namespace VisualPinball.Unity
 	public class CalloutRequester : MonoBehaviour
 	{
 		[SerializeField]
-		private VoiceAsset _voiceAsset;
+		private CalloutAsset _calloutAsset;
 
 		[SerializeField]
 		private SoundPriority _priority = SoundPriority.Medium;
@@ -36,7 +36,7 @@ public class CalloutRequester : MonoBehaviour
 
 		private void OnEnable()
 		{
-			var request = new CalloutRequest(_voiceAsset, _priority, _maxQueueTime);
+			var request = new CalloutRequest(_calloutAsset, _priority, _maxQueueTime);
 			_coordinator = GetComponentInParent<CalloutCoordinator>();
 			_coordinator.EnqueueCallout(request);
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
index abf1e43d3..9cd8b7832 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/DefaultVpeAudioMixer.mixer
@@ -140,7 +140,7 @@ AudioMixerGroupController:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Voice
+  m_Name: Callouts
   m_AudioMixer: {fileID: 24100000}
   m_GroupID: 5cc611b5ca08f754c9b4d902bb28443e
   m_Children: []
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index acdf291be..91e5900a2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -35,7 +35,7 @@ public enum SoundPriority
 	}
 
 	/// <summary>
-	/// Common base class for sound effect assets, voice assets, and music assets. Multiple audio
+	/// Common base class for sound effect assets, callout assets, and music assets. Multiple audio
 	/// clips can be assigned for variation. Instances of this class are Unity assets and can
 	/// therefore be stored in the project files or in an asset library for reuse across tables.
 	/// </summary>

From 035eef8775841463c8f4571bc61051214f784987 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:03:44 +0100
Subject: [PATCH 36/53] Fix compiler errors

---
 .../Sound/SoundComponentInspector.cs               | 14 +++++---------
 .../Sound/EventSoundComponent.cs                   |  2 +-
 .../Sound/SoundEffectComponent.cs                  |  7 +++++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index 363793559..a87a9a3c9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -50,19 +50,17 @@ protected void InvalidSoundAssetHelpBox(VisualElement container)
 				HelpBoxMessageType.Warning
 			);
 			container.Add(helpBox);
-			var soundAssetProp = serializedObject.FindProperty(nameof(SoundComponent._soundAsset));
+			var soundAssetProp = serializedObject.FindProperty("_soundAsset");
 			UpdateVisibility(soundAssetProp);
 			helpBox.TrackPropertyValue(soundAssetProp, UpdateVisibility);
 
 			void UpdateVisibility(SerializedProperty prop)
 			{
 				var soundAsset = prop.objectReferenceValue as SoundAsset;
-				if (soundAsset == null || soundAsset.IsValid()) {
+				if (soundAsset == null || soundAsset.IsValid())
 					helpBox.style.display = DisplayStyle.None;
-
-				} else {
+				else
 					helpBox.style.display = DisplayStyle.Flex;
-				}
 			}
 		}
 
@@ -93,7 +91,6 @@ private bool AllTargetsSupportLoopingSoundAssets()
 					continue;
 				if (!(target as SoundEffectComponent).SupportsLoopingSoundAssets())
 					return false;
-				}
 			}
 			return true;
 		}
@@ -118,9 +115,8 @@ void UpdateVisbility(SerializedObject obj)
 				var soundAsset = soundAssetProp.objectReferenceValue as SoundEffectAsset;
 				if (soundAsset && soundAsset.Loop && !AllTargetsSupportLoopingSoundAssets())
 					helpBox.style.display = DisplayStyle.Flex;
-				} else {
+				else
 					helpBox.style.display = DisplayStyle.None;
-				}
 			}
 		}
 
@@ -146,7 +142,7 @@ void UpdateProperty(DropdownField dd)
 			void UpdateDropdown(SerializedProperty property)
 			{
 				var id = property.stringValue;
-				if (idsToDisplayNames.TryGetValue(id, out var displayName)) {
+				if (idsToDisplayNames.TryGetValue(id, out var displayName))
 					dropdown.value = displayName;
 				else if (string.IsNullOrEmpty(id) && idsToDisplayNames.Count > 0)
 				{
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
index adad0ae81..4a9b5788c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
@@ -19,7 +19,7 @@ namespace VisualPinball.Unity
 	/// <summary>
 	/// Start and or stop a sound when an event occurs.
 	/// </summary>
-	public abstract class EventSoundComponent<TEventSource, TEventArgs> : SoundComponent where TEventSource : class
+	public abstract class EventSoundComponent<TEventSource, TEventArgs> : SoundEffectComponent where TEventSource : class
 	{
 		private TEventSource _eventSource;
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
index 8a9106f7b..0c9e0e1fb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
@@ -66,14 +66,16 @@ public async Task Play()
 				Logger.Warn("Cannot play a disabled sound component.");
 				return;
 			}
+
 			if (_soundAsset == null)
 			{
 				Logger.Warn("Cannot play without sound asset. Assign it in the inspector.");
 				return;
 			}
 
-			if (_interrupt) {
+			if (_interrupt)
 				Stop(allowFade: true);
+
 			try
 			{
 				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
@@ -83,8 +85,9 @@ public async Task Play()
 
 		public void Stop(bool allowFade)
 		{
-			if (!isActiveAndEnabled) {
+			if (!isActiveAndEnabled)
 				return;
+
 			if (allowFade)
 			{
 				_allowFadeCts?.Cancel();

From 2dea5c288750bea1a7f16e39f64f299928bbf8d8 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 13 Feb 2025 23:10:39 +0100
Subject: [PATCH 37/53] Sound component can play music and callouts
 (incomplete)

---
 .../Sound/CoilSoundComponentInspector.cs      |  4 +-
 .../Sound/CoilSoundComponentInspector.cs.meta |  4 +-
 .../Sound/SoundAssetInspector.uxml            |  1 -
 .../Sound/SoundComponentInspector.cs          | 42 ++++++++++++++-----
 .../Sound/SoundComponentInspector.cs.meta     |  4 +-
 .../Sound/SoundComponentInspector.uxml        | 12 ++++++
 .../Sound/SoundComponentInspector.uxml.meta   | 10 +++++
 .../Sound/SwitchSoundComponentInspector.cs    |  6 +--
 .../SwitchSoundComponentInspector.cs.meta     |  4 +-
 .../VisualPinball.Unity/Sound/CalloutAsset.cs |  2 +
 .../Sound/EventSoundComponent.cs              | 10 +++--
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |  2 +
 .../VisualPinball.Unity/Sound/SoundAsset.cs   |  2 +
 ...ndEffectComponent.cs => SoundComponent.cs} | 12 ++++--
 ...mponent.cs.meta => SoundComponent.cs.meta} |  0
 .../Sound/SoundEffectAsset.cs                 |  2 +-
 .../Sound/SwitchSoundComponent.cs             |  5 +--
 17 files changed, 93 insertions(+), 29 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml.meta
 rename VisualPinball.Unity/VisualPinball.Unity/Sound/{SoundEffectComponent.cs => SoundComponent.cs} (90%)
 rename VisualPinball.Unity/VisualPinball.Unity/Sound/{SoundEffectComponent.cs.meta => SoundComponent.cs.meta} (100%)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
index a5d231b93..4be092114 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
@@ -26,12 +26,12 @@ namespace VisualPinball.Unity.Editor
 	public class CoilSoundComponentInspector : SoundComponentInspector
 	{
 		[SerializeField]
-		private VisualTreeAsset inspectorXml;
+		private VisualTreeAsset subInspectorXml;
 
 		public override VisualElement CreateInspectorGUI()
 		{
 			var root = base.CreateInspectorGUI();
-			var inspectorUi = inspectorXml.Instantiate();
+			var inspectorUi = subInspectorXml.Instantiate();
 			root.Add(inspectorUi);
 			var coilNameDropdown = root.Q<DropdownField>("coil-name");
 			var coilNameProp = serializedObject.FindProperty(nameof(CoilSoundComponent._coilName));
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
index 515550dac..1adcc8431 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
@@ -4,7 +4,9 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences:
-  - inspectorXml: {fileID: 9197481963319205126, guid: 2e43810c575be6d46ae19bed7c1b38bd,
+  - inspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+      type: 3}
+  - subInspectorXml: {fileID: 9197481963319205126, guid: 2e43810c575be6d46ae19bed7c1b38bd,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
index f63df3af7..20d2410c2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
@@ -3,6 +3,5 @@
     <ui:TextField picking-mode="Ignore" label="Description" multiline="true" binding-path="_description" name="description" class="multiline-textfield unity-base-field__aligned" />
     <uie:PropertyField name="clips" binding-path="_clips" label="Clips" />
     <uie:PropertyField name="clip-selection-method" binding-path="_clipSelectionMethod" label="Clip Selection Method" />
-    <uie:PropertyField name="is-spatial" binding-path="_isSpatial" label="Is Spatial" />
     <uie:ObjectField label="Audio Mixer Group" binding-path="_audioMixerGroup" name="audio-mixer-group" type="UnityEngine.Audio.AudioMixerGroup, UnityEngine.AudioModule" class="unity-base-field__aligned" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index a87a9a3c9..9da68d3be 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -18,24 +18,46 @@
 using System.Linq;
 using UnityEditor;
 using UnityEditor.UIElements;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
 {
-	[
-		CustomEditor(typeof(SoundEffectComponent), editorForChildClasses: true),
-		CanEditMultipleObjects
-	]
+	[CustomEditor(typeof(SoundComponent), editorForChildClasses: true), CanEditMultipleObjects]
 	public class SoundComponentInspector : UnityEditor.Editor
 	{
+		[SerializeField]
+		private VisualTreeAsset inspectorXml;
+
 		public override VisualElement CreateInspectorGUI()
 		{
 			var container = new VisualElement();
 			AddHelpBoxes(container);
-			InspectorElement.FillDefaultInspector(container, serializedObject, this);
+			container.Add(inspectorXml.Instantiate());
+			ConfigureFieldVisibility(container);
 			return container;
 		}
 
+		private void ConfigureFieldVisibility(VisualElement container)
+		{
+			var soundAssetProp = serializedObject.FindProperty("_soundAsset");
+			var calloutFields = container.Q<VisualElement>("callout-fields");
+			var musicFields = container.Q<VisualElement>("music-fields");
+			UpdateFieldVisibility(soundAssetProp);
+			var soundAssetField = container.Q<PropertyField>("sound-asset");
+			soundAssetField.TrackPropertyValue(soundAssetProp, UpdateFieldVisibility);
+
+			void UpdateFieldVisibility(SerializedProperty prop)
+			{
+				var isCalloutAsset = soundAssetProp.objectReferenceValue is CalloutAsset;
+				calloutFields.style.display = isCalloutAsset
+					? DisplayStyle.Flex
+					: DisplayStyle.None;
+				var isMusicAsset = soundAssetProp.objectReferenceValue is MusicAsset;
+				musicFields.style.display = isMusicAsset ? DisplayStyle.Flex : DisplayStyle.None;
+			}
+		}
+
 		protected virtual void AddHelpBoxes(VisualElement container)
 		{
 			MissingComponentHelpBox(container);
@@ -66,9 +88,9 @@ void UpdateVisibility(SerializedProperty prop)
 
 		protected void MissingComponentHelpBox(VisualElement container)
 		{
-			if (target != null && target is SoundEffectComponent)
+			if (target != null && target is SoundComponent)
 			{
-				var soundComp = target as SoundEffectComponent;
+				var soundComp = target as SoundComponent;
 				var requiredType = soundComp.GetRequiredType();
 				if (requiredType != null && !soundComp.TryGetComponent(requiredType, out var _))
 					container.Add(
@@ -87,9 +109,9 @@ private bool AllTargetsSupportLoopingSoundAssets()
 			{
 				if (target == null)
 					continue;
-				if (target is not SoundEffectComponent)
+				if (target is not SoundComponent)
 					continue;
-				if (!(target as SoundEffectComponent).SupportsLoopingSoundAssets())
+				if (!(target as SoundComponent).SupportsLoopingSoundAssets())
 					return false;
 			}
 			return true;
@@ -112,7 +134,7 @@ protected void InfiniteLoopHelpBox(VisualElement container)
 			void UpdateVisbility(SerializedObject obj)
 			{
 				var soundAssetProp = obj.FindProperty("_soundAsset");
-				var soundAsset = soundAssetProp.objectReferenceValue as SoundEffectAsset;
+				var soundAsset = soundAssetProp.objectReferenceValue as SoundAsset;
 				if (soundAsset && soundAsset.Loop && !AllTargetsSupportLoopingSoundAssets())
 					helpBox.style.display = DisplayStyle.Flex;
 				else
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta
index eb68aad9c..064d2bd52 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta
@@ -3,7 +3,9 @@ guid: ab250a07b4d24884c85a0ad075020852
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - inspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+      type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
   userData: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
new file mode 100644
index 000000000..34c3d0db1
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
@@ -0,0 +1,12 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <uie:PropertyField name="sound-asset" binding-path="_soundAsset" label="Sound Asset" />
+    <uie:PropertyField name="interrupt" binding-path="_interrupt" label="Interrupt" />
+    <uie:PropertyField name="volume" binding-path="_volume" label="Volume" />
+    <ui:VisualElement name="callout-fields" style="flex-grow: 1;">
+        <uie:PropertyField name="priority" binding-path="_priority" label="Priority" />
+        <uie:PropertyField name="max-queue-time" binding-path="_maxQueueTime" label="Max Queue Time" tooltip="How many seconds to wait in the queue before discarding the request. -1 = no limit" />
+    </ui:VisualElement>
+    <ui:VisualElement name="music-fields" style="flex-grow: 1;">
+        <uie:PropertyField name="priority" binding-path="_priority" label="Priority" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml.meta
new file mode 100644
index 000000000..b8b8f1259
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 86610575353b6f44aa325d86ee6d779b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
index bd471dbf6..a9ed4519c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
@@ -26,15 +26,15 @@ namespace VisualPinball.Unity.Editor
 	public class SwitchSoundComponentInspector : SoundComponentInspector
 	{
 		[SerializeField]
-		private VisualTreeAsset inspectorXml;
+		private VisualTreeAsset subInspectorXml;
 
 		public override VisualElement CreateInspectorGUI()
 		{
 			var root = base.CreateInspectorGUI();
-			var inspectorUi = inspectorXml.Instantiate();
+			var inspectorUi = subInspectorXml.Instantiate();
 			root.Add(inspectorUi);
 			var switchNameDropdown = root.Q<DropdownField>("switch-name");
-			var switchNameProp = serializedObject.FindProperty(nameof(SwitchSoundComponent._switchName));
+			var switchNameProp = serializedObject.FindProperty("_switchName");
 			var availableSwitches = GetAvailableSwitches();
 			ConfigureDropdown(switchNameDropdown, switchNameProp, availableSwitches);
 			return root;
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
index 4babc6faa..256cc1d0d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
@@ -4,7 +4,9 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences:
-  - inspectorXml: {fileID: 9197481963319205126, guid: 309992e82c095df4fbcdc6d516f59392,
+  - inspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+      type: 3}
+  - subInspectorXml: {fileID: 9197481963319205126, guid: 309992e82c095df4fbcdc6d516f59392,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index 5e007ef29..b1066f32f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -27,6 +27,8 @@ namespace VisualPinball.Unity
 	)]
 	public class CalloutAsset : SoundAsset
 	{
+		public override bool Loop => false;
+
 		public async Task Play(GameObject audioObj, CancellationToken ct)
 		{
 			ct.ThrowIfCancellationRequested();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
index 4a9b5788c..a9108abd0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
@@ -19,7 +19,8 @@ namespace VisualPinball.Unity
 	/// <summary>
 	/// Start and or stop a sound when an event occurs.
 	/// </summary>
-	public abstract class EventSoundComponent<TEventSource, TEventArgs> : SoundEffectComponent where TEventSource : class
+	public abstract class EventSoundComponent<TEventSource, TEventArgs> : SoundComponent
+		where TEventSource : class
 	{
 		private TEventSource _eventSource;
 
@@ -31,9 +32,12 @@ public abstract class EventSoundComponent<TEventSource, TEventArgs> : SoundEffec
 		protected override void OnEnableAfterAfterAwake()
 		{
 			base.OnEnableAfterAfterAwake();
-			if (TryFindEventSource(out _eventSource)) {
+			if (TryFindEventSource(out _eventSource))
+			{
 				Subscribe(_eventSource);
-			} else {
+			}
+			else
+			{
 				Logger.Warn(
 					$"Could not find sound event source of type {typeof(TEventSource).Name} on "
 						+ $"game object '{name}.' Make sure an appropriate component is attached."
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 0504360e7..043340cc4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -28,6 +28,8 @@ public class MusicAsset : SoundAsset
 	{
 		public float Volume => _volume;
 
+		public override bool Loop => true;
+
 		[SerializeField]
 		[Range(0f, 1f)]
 		private float _volume = 1f;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index 91e5900a2..c1724b3fc 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -62,6 +62,8 @@ private enum SelectionMethod
 		[NonSerialized]
 		private int _roundRobinIndex = 0;
 
+		public abstract bool Loop { get; }
+
 		public virtual void ConfigureAudioSource(AudioSource audioSource)
 		{
 			audioSource.clip = GetClip();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
similarity index 90%
rename from VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
rename to VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index 0c9e0e1fb..9419ec89e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -27,10 +27,10 @@ namespace VisualPinball.Unity
 	/// Base component for playing a <c>SoundAsset</c> using the public methods <c>Play</c> and <c>Stop</c>.
 	/// </summary>
 	[AddComponentMenu("Visual Pinball/Sound/Sound")]
-	public class SoundEffectComponent : EnableAfterAwakeComponent
+	public class SoundComponent : EnableAfterAwakeComponent
 	{
 		[SerializeReference]
-		protected SoundEffectAsset _soundAsset;
+		protected SoundAsset _soundAsset;
 
 		[SerializeField]
 		[Tooltip("Should the sound be interrupted if it is triggered again while already playing?")]
@@ -39,6 +39,12 @@ public class SoundEffectComponent : EnableAfterAwakeComponent
 		[SerializeField, Range(0f, 1f)]
 		private float _volume = 1f;
 
+		[SerializeField]
+		private SoundPriority _priority;
+
+		[SerializeField]
+		private float _maxQueueTime = -1;
+
 		private CancellationTokenSource _instantCts;
 		private CancellationTokenSource _allowFadeCts;
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -78,7 +84,7 @@ public async Task Play()
 
 			try
 			{
-				await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
+				//await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
 			}
 			catch (OperationCanceledException) { }
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectComponent.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 9a0fbc6cf..0b52cb03c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -46,7 +46,7 @@ public enum SoundEffectType
 	)]
 	public class SoundEffectAsset : SoundAsset
 	{
-		public bool Loop => _loop;
+		public override bool Loop => _loop;
 
 		[SerializeField]
 		private Vector2 _volumeRange = new(1f, 1f);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
index bc5916870..f84007d3c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
@@ -28,7 +28,7 @@ namespace VisualPinball.Unity
 	public class SwitchSoundComponent : BinaryEventSoundComponent<IApiSwitch, SwitchEventArgs>
 	{
 		[SerializeField, HideInInspector]
-		public string _switchName;
+		private string _switchName;
 
 		public override Type GetRequiredType() => typeof(ISwitchDeviceComponent);
 
@@ -41,9 +41,8 @@ protected override bool TryFindEventSource(out IApiSwitch @switch)
 			foreach (var component in GetComponents<ISwitchDeviceComponent>())
 			{
 				@switch = player.Switch(component, _switchName);
-				if (@switch != null) {
+				if (@switch != null)
 					return true;
-				}
 			}
 			return false;
 		}

From 75fc7ac5de8a86cd0791ba50543ad6bc305f3de9 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Fri, 14 Feb 2025 11:29:59 +0100
Subject: [PATCH 38/53] Format sound code

---
 .../Sound/CoilSoundComponentInspector.cs             |  6 +++++-
 .../Sound/BinaryEventSoundComponent.cs               | 12 ++++++++----
 .../VisualPinball.Unity/Sound/CoilSoundComponent.cs  |  9 ++++++---
 .../VisualPinball.Unity/Sound/HitSoundComponent.cs   |  9 ++++-----
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
index 4be092114..5ba30a0e6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
@@ -43,7 +43,11 @@ public override VisualElement CreateInspectorGUI()
 		private Dictionary<string, string> GetAvailableCoils()
 		{
 			var targetComponent = target as Component;
-			if (targetComponent != null && targetComponent.TryGetComponent<ICoilDeviceComponent>(out var coilDevice)) {
+			if (
+				targetComponent != null
+				&& targetComponent.TryGetComponent<ICoilDeviceComponent>(out var coilDevice)
+			)
+			{
 				return coilDevice.AvailableCoils.ToDictionary(
 					i => i.Id,
 					i => string.IsNullOrWhiteSpace(i.Description) ? i.Id : i.Description
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
index a3b9ee87e..3bbd74a88 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
@@ -49,14 +49,18 @@ public enum StopWhen
 		protected override async void OnEvent(object sender, TEventArgs e)
 		{
 			bool isEnabled = InterpretAsBinary(e);
-			if ((isEnabled && _stopWhen == StopWhen.TurnedOn) ||
-			    (!isEnabled && _stopWhen == StopWhen.TurnedOff))
+			if (
+				(isEnabled && _stopWhen == StopWhen.TurnedOn)
+				|| (!isEnabled && _stopWhen == StopWhen.TurnedOff)
+			)
 			{
 				Stop(allowFade: true);
 			}
 
-			if ((isEnabled && _startWhen == StartWhen.TurnedOn) ||
-			    (!isEnabled && _startWhen == StartWhen.TurnedOff))
+			if (
+				(isEnabled && _startWhen == StartWhen.TurnedOn)
+				|| (!isEnabled && _startWhen == StartWhen.TurnedOff)
+			)
 			{
 				await Play();
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
index fd81e8825..183587b5d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
@@ -36,13 +36,16 @@ protected override bool TryFindEventSource(out IApiCoil coil)
 		{
 			coil = null;
 			var player = GetComponentInParent<Player>();
-			if (player == null) {
+			if (player == null)
+			{
 				return false;
 			}
 
-			foreach (var component in GetComponents<ICoilDeviceComponent>()) {
+			foreach (var component in GetComponents<ICoilDeviceComponent>())
+			{
 				coil = player.Coil(component, _coilName);
-				if (coil != null) {
+				if (coil != null)
+				{
 					return true;
 				}
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
index 8af31d264..b063759de 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
@@ -33,15 +33,14 @@ protected override bool TryFindEventSource(out IApiHittable hittable)
 		{
 			hittable = null;
 			var player = GetComponentInParent<Player>();
-			if (player == null) {
+			if (player == null)
 				return false;
-			}
 
-			foreach (var component in GetComponents<ItemComponent>()) {
+			foreach (var component in GetComponents<ItemComponent>())
+			{
 				hittable = player.TableApi.Hittable(component);
-				if (hittable != null) {
+				if (hittable != null)
 					return true;
-				}
 			}
 			return false;
 		}

From 97b9845f4c7e9925ec7dfa25f2339a7f643cdd86 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Fri, 14 Feb 2025 21:11:48 +0100
Subject: [PATCH 39/53] Sound component can play music and callouts

---
 .../BinaryEventSoundComponentInspector.cs     | 37 ++++++++
 ...BinaryEventSoundComponentInspector.cs.meta | 15 +++
 .../BinaryEventSoundComponentInspector.uxml   |  4 +
 ...naryEventSoundComponentInspector.uxml.meta | 10 ++
 .../Sound/CoilSoundComponentInspector.cs      |  6 +-
 .../Sound/CoilSoundComponentInspector.cs.meta |  6 +-
 .../Sound/SoundComponentInspector.cs          |  4 +-
 .../Sound/SoundComponentInspector.cs.meta     |  2 +-
 .../Sound/SwitchSoundComponentInspector.cs    |  6 +-
 .../SwitchSoundComponentInspector.cs.meta     |  6 +-
 .../Sound/BinaryEventSoundComponent.cs        |  6 +-
 .../VisualPinball.Unity/Sound/CalloutAsset.cs | 23 -----
 .../Sound/CalloutCoordinator.cs               | 95 +++++++++++++++++--
 .../Sound/CalloutRequest.cs                   | 10 +-
 .../Sound/CalloutRequester.cs                 |  9 +-
 .../Sound/HitSoundComponent.cs                |  2 +-
 .../VisualPinball.Unity/Sound/SoundAsset.cs   | 18 +++-
 .../Sound/SoundComponent.cs                   | 83 +++++++++++-----
 .../Sound/SoundEffectAsset.cs                 | 48 ++++++----
 19 files changed, 294 insertions(+), 96 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs
new file mode 100644
index 000000000..38301121f
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs
@@ -0,0 +1,37 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CanEditMultipleObjects]
+	public class BinaryEventSoundComponentInspector : SoundComponentInspector
+	{
+		[SerializeField]
+		private VisualTreeAsset binaryEventSoundInspectorXml;
+
+		public override VisualElement CreateInspectorGUI()
+		{
+			var root = base.CreateInspectorGUI();
+			var inspectorUi = binaryEventSoundInspectorXml.Instantiate();
+			root.Add(inspectorUi);
+			return root;
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs.meta
new file mode 100644
index 000000000..fe2fbd354
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs.meta
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: 65e51f0d7750c174dbfbbf7e0aae53f1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - soundComponentInspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+      type: 3}
+  - binaryEventSoundInspectorXml: {fileID: 9197481963319205126, guid: 4f53d90e909a16548a163671ab9f2132,
+      type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
new file mode 100644
index 000000000..2422c9619
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
@@ -0,0 +1,4 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <uie:PropertyField binding-path="_startWhen" label="Start When" tooltip="When to start playing the sound" />
+    <uie:PropertyField binding-path="_stopWhen" label="Stop When" tooltip="When to stop playing the sound" />
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml.meta
new file mode 100644
index 000000000..258dfa17f
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 4f53d90e909a16548a163671ab9f2132
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
index 5ba30a0e6..224b04fa3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
@@ -23,15 +23,15 @@
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(CoilSoundComponent)), CanEditMultipleObjects]
-	public class CoilSoundComponentInspector : SoundComponentInspector
+	public class CoilSoundComponentInspector : BinaryEventSoundComponentInspector
 	{
 		[SerializeField]
-		private VisualTreeAsset subInspectorXml;
+		private VisualTreeAsset coilSoundInspectorXml;
 
 		public override VisualElement CreateInspectorGUI()
 		{
 			var root = base.CreateInspectorGUI();
-			var inspectorUi = subInspectorXml.Instantiate();
+			var inspectorUi = coilSoundInspectorXml.Instantiate();
 			root.Add(inspectorUi);
 			var coilNameDropdown = root.Q<DropdownField>("coil-name");
 			var coilNameProp = serializedObject.FindProperty(nameof(CoilSoundComponent._coilName));
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
index 1adcc8431..203c6335b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
@@ -4,9 +4,11 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences:
-  - inspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+  - soundComponentInspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
       type: 3}
-  - subInspectorXml: {fileID: 9197481963319205126, guid: 2e43810c575be6d46ae19bed7c1b38bd,
+  - binaryEventSoundInspectorXml: {fileID: 9197481963319205126, guid: 4f53d90e909a16548a163671ab9f2132,
+      type: 3}
+  - coilSoundInspectorXml: {fileID: 9197481963319205126, guid: 2e43810c575be6d46ae19bed7c1b38bd,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index 9da68d3be..7f44ba79d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -27,13 +27,13 @@ namespace VisualPinball.Unity.Editor
 	public class SoundComponentInspector : UnityEditor.Editor
 	{
 		[SerializeField]
-		private VisualTreeAsset inspectorXml;
+		private VisualTreeAsset soundComponentInspectorXml;
 
 		public override VisualElement CreateInspectorGUI()
 		{
 			var container = new VisualElement();
 			AddHelpBoxes(container);
-			container.Add(inspectorXml.Instantiate());
+			container.Add(soundComponentInspectorXml.Instantiate());
 			ConfigureFieldVisibility(container);
 			return container;
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta
index 064d2bd52..7950096db 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences:
-  - inspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+  - soundComponentInspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
index a9ed4519c..01cf8434b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
@@ -23,15 +23,15 @@
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(SwitchSoundComponent)), CanEditMultipleObjects]
-	public class SwitchSoundComponentInspector : SoundComponentInspector
+	public class SwitchSoundComponentInspector : BinaryEventSoundComponentInspector
 	{
 		[SerializeField]
-		private VisualTreeAsset subInspectorXml;
+		private VisualTreeAsset switchSoundInspectorXml;
 
 		public override VisualElement CreateInspectorGUI()
 		{
 			var root = base.CreateInspectorGUI();
-			var inspectorUi = subInspectorXml.Instantiate();
+			var inspectorUi = switchSoundInspectorXml.Instantiate();
 			root.Add(inspectorUi);
 			var switchNameDropdown = root.Q<DropdownField>("switch-name");
 			var switchNameProp = serializedObject.FindProperty("_switchName");
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
index 256cc1d0d..806eb6235 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
@@ -4,9 +4,11 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences:
-  - inspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
+  - soundComponentInspectorXml: {fileID: 9197481963319205126, guid: 86610575353b6f44aa325d86ee6d779b,
       type: 3}
-  - subInspectorXml: {fileID: 9197481963319205126, guid: 309992e82c095df4fbcdc6d516f59392,
+  - binaryEventSoundInspectorXml: {fileID: 9197481963319205126, guid: 4f53d90e909a16548a163671ab9f2132,
+      type: 3}
+  - switchSoundInspectorXml: {fileID: 9197481963319205126, guid: 309992e82c095df4fbcdc6d516f59392,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
index 3bbd74a88..5e9bb84c4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
@@ -46,7 +46,7 @@ public enum StopWhen
 		[SerializeField]
 		private StopWhen _stopWhen = StopWhen.Never;
 
-		protected override async void OnEvent(object sender, TEventArgs e)
+		protected override void OnEvent(object sender, TEventArgs e)
 		{
 			bool isEnabled = InterpretAsBinary(e);
 			if (
@@ -54,7 +54,7 @@ protected override async void OnEvent(object sender, TEventArgs e)
 				|| (!isEnabled && _stopWhen == StopWhen.TurnedOff)
 			)
 			{
-				Stop(allowFade: true);
+				StopAllSounds(allowFade: true);
 			}
 
 			if (
@@ -62,7 +62,7 @@ protected override async void OnEvent(object sender, TEventArgs e)
 				|| (!isEnabled && _startWhen == StartWhen.TurnedOff)
 			)
 			{
-				await Play();
+				StartSound();
 			}
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index b1066f32f..83f2e6636 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -28,28 +28,5 @@ namespace VisualPinball.Unity
 	public class CalloutAsset : SoundAsset
 	{
 		public override bool Loop => false;
-
-		public async Task Play(GameObject audioObj, CancellationToken ct)
-		{
-			ct.ThrowIfCancellationRequested();
-			var audioSource = audioObj.AddComponent<AudioSource>();
-
-			try
-			{
-				ConfigureAudioSource(audioSource);
-				audioSource.Play();
-				await WaitUntilAudioStops(audioSource, ct);
-			}
-			finally
-			{
-				if (audioSource != null)
-				{
-					if (Application.isPlaying)
-						Destroy(audioSource);
-					else
-						DestroyImmediate(audioSource);
-				}
-			}
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index aa13997e3..45a9b55a7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -18,7 +18,9 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using UnityEngine;
+using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
 {
@@ -35,19 +37,49 @@ public class CalloutCoordinator : MonoBehaviour
 
 		private readonly List<CalloutRequest> _calloutQ = new();
 		private CancellationTokenSource _loopCts;
+		private CancellationTokenSource _currentCalloutCts;
 		private Task _loopTask;
 		private TaskCompletionSource<bool> _waitForNewCalloutTcs;
+		private int _requestCounter;
+		private int _idOfCurrentlyPlayingRequest = -1;
 
-		public void EnqueueCallout(CalloutRequest callout)
+		private static Logger Logger = LogManager.GetCurrentClassLogger();
+
+		public void EnqueueCallout(CalloutRequest request, out int requestId)
 		{
-			var i = _calloutQ.FindIndex(x => x.Priority < callout.Priority);
+			request.Index = _requestCounter;
+			requestId = _requestCounter;
+			_requestCounter++;
+			var i = _calloutQ.FindIndex(x => x.Priority < request.Priority);
 			if (i != -1)
-				_calloutQ.Insert(i, callout);
+				_calloutQ.Insert(i, request);
 			else
-				_calloutQ.Add(callout);
+				_calloutQ.Add(request);
 			_waitForNewCalloutTcs?.TrySetResult(true);
 		}
 
+		public void DequeueCallout(int requestId)
+		{
+			var index = _calloutQ.FindIndex(x => x.Index == requestId);
+			if (index != -1)
+				_calloutQ.RemoveAt(index);
+			else if (
+				_idOfCurrentlyPlayingRequest != -1
+				&& requestId == _idOfCurrentlyPlayingRequest
+			)
+				_currentCalloutCts.Cancel();
+			else if (requestId >= 0 && requestId <= _requestCounter)
+				Logger.Info(
+					$"Cannot dequeue callout request with id '{requestId}' because it already "
+						+ "finished playing."
+				);
+			else
+				Logger.Error(
+					$"Cannot dequeue callout request with id '{requestId}' because no such request "
+						+ "was previously made."
+				);
+		}
+
 		private void OnEnable()
 		{
 			_loopCts = new();
@@ -78,15 +110,62 @@ private async Task CalloutLoop(CancellationToken ct)
 					await _waitForNewCalloutTcs.Task;
 				}
 
-				var callout = _calloutQ[0];
+				var request = _calloutQ[0];
 				_calloutQ.RemoveAt(0);
-				var calloutGo = GetCalloutGameObject(callout.CalloutAsset.name);
-				await callout.Play(calloutGo, ct);
-				Destroy(calloutGo);
+
+				_currentCalloutCts = new CancellationTokenSource();
+
+				try
+				{
+					using var playCts = CancellationTokenSource.CreateLinkedTokenSource(
+						ct,
+						_currentCalloutCts.Token
+					);
+
+					_idOfCurrentlyPlayingRequest = request.Index;
+					await Play(request, playCts.Token);
+				}
+				catch (OperationCanceledException)
+				{
+					// If only the current callout was canceled, continue, but if it's the whole
+					// loop, throw
+					ct.ThrowIfCancellationRequested();
+				}
+				finally
+				{
+					_idOfCurrentlyPlayingRequest = -1;
+					_currentCalloutCts.Dispose();
+				}
+
 				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
 			}
 		}
 
+		private async Task Play(CalloutRequest request, CancellationToken ct)
+		{
+			ct.ThrowIfCancellationRequested();
+			var calloutGo = GetCalloutGameObject(request.CalloutAsset.name);
+			var audioSource = calloutGo.AddComponent<AudioSource>();
+
+			try
+			{
+				request.CalloutAsset.ConfigureAudioSource(audioSource);
+				audioSource.Play();
+				await SoundAsset.WaitUntilAudioStops(audioSource, ct);
+			}
+			finally
+			{
+				if (audioSource != null)
+				{
+					if (Application.isPlaying)
+						Destroy(audioSource);
+					else
+						DestroyImmediate(audioSource);
+				}
+				Destroy(calloutGo);
+			}
+		}
+
 		private GameObject GetCalloutGameObject(string calloutName)
 		{
 			var calloutsGoName = $"Callout: {calloutName}";
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
index 55ed3bf9d..ab08205c7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
@@ -27,6 +27,12 @@ public struct CalloutRequest
 	{
 		public SoundPriority Priority { get; private set; }
 
+		/// <summary>
+		/// Set by <c>CalloutCoordinator</c> to uniquely identify this request so it can be removed
+		/// later.
+		/// </summary>
+		public int Index { get; set; }
+
 		public readonly CalloutAsset CalloutAsset;
 		private readonly float _deadline;
 
@@ -48,6 +54,7 @@ public CalloutRequest(
 				_deadline = Time.time + maxQueueTime;
 			else
 				_deadline = -1f;
+			Index = -1;
 		}
 
 		public readonly bool IsExpired()
@@ -56,8 +63,5 @@ public readonly bool IsExpired()
 				return false;
 			return Time.time > _deadline;
 		}
-
-		public readonly async Task Play(GameObject audioObj, CancellationToken ct) =>
-			await CalloutAsset.Play(audioObj, ct);
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
index 7e23020ae..e00283247 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
@@ -34,11 +34,18 @@ public class CalloutRequester : MonoBehaviour
 
 		private CalloutCoordinator _coordinator;
 
+		private int _requestId;
+
 		private void OnEnable()
 		{
 			var request = new CalloutRequest(_calloutAsset, _priority, _maxQueueTime);
 			_coordinator = GetComponentInParent<CalloutCoordinator>();
-			_coordinator.EnqueueCallout(request);
+			_coordinator.EnqueueCallout(request, out _requestId);
+		}
+
+		private void OnDisable()
+		{
+			_coordinator.DequeueCallout(_requestId);
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
index b063759de..ddbf5844e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
@@ -45,7 +45,7 @@ protected override bool TryFindEventSource(out IApiHittable hittable)
 			return false;
 		}
 
-		protected override async void OnEvent(object sender, HitEventArgs e) => await Play();
+		protected override void OnEvent(object sender, HitEventArgs e) => StartSound();
 
 		protected override void Subscribe(IApiHittable eventSource) => eventSource.Hit += OnEvent;
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index c1724b3fc..22ba9434d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -106,9 +106,25 @@ private AudioClip GetClip()
 			}
 		}
 
+		/// <summary>
+		/// <c>AudioSource.isPlaying</c> returns <c>false</c> if the window loses focus, so that
+		/// needs to be checked as well to make sure an audio source that was playing actually has
+		/// stopped.
+		/// </summary>
+		public static bool HasStopped(AudioSource audioSource)
+		{
+			if (audioSource.isPlaying)
+				return false;
+#if UNITY_EDITOR
+			return EditorApplication.isFocused;
+#else
+			return Application.isFocused;
+#endif
+		}
+
 		public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
 		{
-			while (audioSource != null && (audioSource.isPlaying || !EditorApplication.isFocused))
+			while (!HasStopped(audioSource))
 			{
 				await Task.Yield();
 				ct.ThrowIfCancellationRequested();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index 9419ec89e..28cceb5bd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -15,10 +15,12 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using NLog;
 using UnityEngine;
+using UnityEngine.Video;
 using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
@@ -40,32 +42,32 @@ public class SoundComponent : EnableAfterAwakeComponent
 		private float _volume = 1f;
 
 		[SerializeField]
-		private SoundPriority _priority;
+		private SoundPriority _priority = SoundPriority.Medium;
 
 		[SerializeField]
 		private float _maxQueueTime = -1;
 
 		private CancellationTokenSource _instantCts;
 		private CancellationTokenSource _allowFadeCts;
+		private CalloutCoordinator _calloutCoordinator;
+		private List<int> _calloutRequestIds = new();
+		private MusicCoordinator _musicCoordinator;
+		private List<int> _musicRequestIds = new();
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
 		protected override void OnEnableAfterAfterAwake()
 		{
 			base.OnEnableAfterAfterAwake();
-			_instantCts = new CancellationTokenSource();
-			_allowFadeCts = new CancellationTokenSource();
+			_calloutCoordinator = GetComponentInParent<CalloutCoordinator>();
+			_musicCoordinator = GetComponentInParent<MusicCoordinator>();
 		}
 
 		protected virtual void OnDisable()
 		{
-			_allowFadeCts?.Dispose();
-			_allowFadeCts = null;
-			_instantCts?.Cancel();
-			_instantCts?.Dispose();
-			_instantCts = null;
+			StopAllSounds(allowFade: true);
 		}
 
-		public async Task Play()
+		protected async void StartSound()
 		{
 			if (!isActiveAndEnabled)
 			{
@@ -80,32 +82,67 @@ public async Task Play()
 			}
 
 			if (_interrupt)
-				Stop(allowFade: true);
+				StopAllSounds(allowFade: true);
+
+			_allowFadeCts ??= new();
+			_instantCts ??= new();
 
 			try
 			{
-				//await _soundAsset.Play(gameObject, _allowFadeCts.Token, _instantCts.Token, _volume);
+				if (_soundAsset is SoundEffectAsset)
+				{
+					await ((SoundEffectAsset)_soundAsset).Play(
+						gameObject,
+						_allowFadeCts.Token,
+						_instantCts.Token,
+						_volume
+					);
+				}
+				else if (_soundAsset is CalloutAsset)
+				{
+					var request = new CalloutRequest(
+						(CalloutAsset)_soundAsset,
+						_priority,
+						_maxQueueTime
+					);
+					_calloutCoordinator.EnqueueCallout(request, out var requestId);
+					_calloutRequestIds.Add(requestId);
+				}
+				else if (_soundAsset is MusicAsset)
+				{
+					var request = new MusicRequest((MusicAsset)_soundAsset, _priority);
+					_musicCoordinator.AddRequest(request, out var requestId);
+					_musicRequestIds.Add(requestId);
+				}
+				else
+				{
+					throw new NotImplementedException(
+						$"Unknown type of sound asset '{_soundAsset.GetType()}'"
+					);
+				}
 			}
 			catch (OperationCanceledException) { }
 		}
 
-		public void Stop(bool allowFade)
+		protected void StopAllSounds(bool allowFade)
 		{
-			if (!isActiveAndEnabled)
-				return;
-
 			if (allowFade)
-			{
 				_allowFadeCts?.Cancel();
-				_allowFadeCts?.Dispose();
-				_allowFadeCts = new();
-			}
 			else
-			{
 				_instantCts?.Cancel();
-				_instantCts?.Dispose();
-				_instantCts = new CancellationTokenSource();
-			}
+
+			_allowFadeCts?.Dispose();
+			_allowFadeCts = null;
+			_instantCts?.Dispose();
+			_instantCts = null;
+
+			foreach (var id in _calloutRequestIds)
+				_calloutCoordinator.DequeueCallout(id);
+			_calloutRequestIds.Clear();
+
+			foreach (var id in _musicRequestIds)
+				_musicCoordinator.RemoveRequest(id);
+			_musicRequestIds.Clear();
 		}
 
 		public virtual bool SupportsLoopingSoundAssets() => true;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 0b52cb03c..ffe43038b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -116,35 +116,43 @@ public async Task Play(
 					instantCt
 				);
 
+				var waitUntilStopTask = WaitUntilAudioStops(audioSource, eitherCts.Token);
+
 				// Fade in
 				if (_loop && _fadeInTime > 0f)
 				{
-					try
-					{
-						await Fade(
-							audioSource,
-							0f,
-							audioSource.volume,
-							_fadeInTime,
-							eitherCts.Token
-						);
-					}
-					catch (OperationCanceledException) { }
+					var fadeTask = Fade(
+						audioSource,
+						0f,
+						audioSource.volume,
+						_fadeInTime,
+						eitherCts.Token
+					);
+					await Task.WhenAny(waitUntilStopTask, fadeTask);
 				}
-				instantCt.ThrowIfCancellationRequested();
 
 				// Play until sound stops or cancellation is requested
 				try
 				{
-					await WaitUntilAudioStops(audioSource, eitherCts.Token);
+					await waitUntilStopTask;
 				}
-				catch (OperationCanceledException) { }
-				instantCt.ThrowIfCancellationRequested();
-
-				// Fade out
-				if (audioSource != null && audioSource.isPlaying && _loop && _fadeOutTime > 0f)
+				catch (OperationCanceledException)
 				{
-					await Fade(audioSource, audioSource.volume, 0f, _fadeOutTime, instantCt);
+					instantCt.ThrowIfCancellationRequested();
+					// Fade out
+					if (_loop && _fadeOutTime > 0f)
+					{
+						var fadeTask = Fade(
+							audioSource,
+							audioSource.volume,
+							0f,
+							_fadeOutTime,
+							instantCt
+						);
+						waitUntilStopTask = WaitUntilAudioStops(audioSource, instantCt);
+						await Task.WhenAny(waitUntilStopTask, fadeTask);
+						allowFadeOutCt.ThrowIfCancellationRequested();
+					}
 				}
 			}
 			finally
@@ -182,7 +190,7 @@ CancellationToken ct
 #else
 				var deltaTime = Time.deltaTime;
 #endif
-				progress += (1f / duration) * deltaTime;
+				progress += 1f / duration * deltaTime;
 				await Task.Yield();
 			}
 		}

From dc95bdbaf93aa9bea06b3cfdcfb2cdf2f31f8d94 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Fri, 14 Feb 2025 21:45:10 +0100
Subject: [PATCH 40/53] FIx volume settings

---
 ...iceAssetInspector.cs => CalloutAssetInspector.cs} |  4 ++--
 ...spector.cs.meta => CalloutAssetInspector.cs.meta} |  2 +-
 ...ssetInspector.uxml => CalloutAssetInspector.uxml} |  1 +
 ...tor.uxml.meta => CalloutAssetInspector.uxml.meta} |  0
 .../VisualPinball.Unity/Sound/CalloutAsset.cs        | 12 ++++++++++--
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs  |  1 +
 .../VisualPinball.Unity/Sound/CalloutRequest.cs      |  7 ++++---
 .../VisualPinball.Unity/Sound/MusicAsset.cs          |  6 ++++++
 .../VisualPinball.Unity/Sound/MusicCoordinator.cs    |  4 +++-
 .../VisualPinball.Unity/Sound/MusicPlayer.cs         | 12 ++++++++++--
 .../VisualPinball.Unity/Sound/MusicRequest.cs        |  8 +++++++-
 .../VisualPinball.Unity/Sound/MusicRequester.cs      |  5 ++++-
 .../VisualPinball.Unity/Sound/SoundComponent.cs      |  7 +++----
 13 files changed, 52 insertions(+), 17 deletions(-)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{VoiceAssetInspector.cs => CalloutAssetInspector.cs} (91%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{VoiceAssetInspector.cs.meta => CalloutAssetInspector.cs.meta} (79%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{VoiceAssetInspector.uxml => CalloutAssetInspector.uxml} (82%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{VoiceAssetInspector.uxml.meta => CalloutAssetInspector.uxml.meta} (100%)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs
similarity index 91%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs
index f4eac44a4..aaba5f2e2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs
@@ -24,14 +24,14 @@ namespace VisualPinball.Unity.Editor
 	public class VoiceAssetInspector : SoundAssetInspector
 	{
 		[SerializeField]
-		private VisualTreeAsset _voiceAssetInspector;
+		private VisualTreeAsset _calloutAssetInspector;
 
 		public override VisualElement CreateInspectorGUI()
 		{
 			var root = new VisualElement();
 			var baseUi = base.CreateInspectorGUI();
 			root.Add(baseUi);
-			var subUi = _voiceAssetInspector.Instantiate();
+			var subUi = _calloutAssetInspector.Instantiate();
 			root.Add(subUi);
 			return root;
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs.meta
similarity index 79%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs.meta
index 399543919..b30a1ad78 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs.meta
@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences:
   - _soundAssetInspectorAsset: {fileID: 9197481963319205126, guid: 84e4ce75c16723f428f39b87bcd555a1,
       type: 3}
-  - _voiceAssetInspector: {fileID: 9197481963319205126, guid: c4009cb1062e5514c9aedd330f512328,
+  - _calloutAssetInspector: {fileID: 9197481963319205126, guid: c4009cb1062e5514c9aedd330f512328,
       type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.uxml
similarity index 82%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.uxml
index 175bd9965..76fa0e858 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.uxml
@@ -1,2 +1,3 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <uie:PropertyField binding-path="_volume" label="Volume" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.uxml.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/VoiceAssetInspector.uxml.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.uxml.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index 83f2e6636..df349e2f3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System.Threading;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace VisualPinball.Unity
@@ -28,5 +26,15 @@ namespace VisualPinball.Unity
 	public class CalloutAsset : SoundAsset
 	{
 		public override bool Loop => false;
+
+		[SerializeField]
+		[Range(0f, 1f)]
+		private float _volume = 1f;
+
+		public override void ConfigureAudioSource(AudioSource audioSource)
+		{
+			base.ConfigureAudioSource(audioSource);
+			audioSource.volume = _volume;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index 45a9b55a7..e05cad56c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -150,6 +150,7 @@ private async Task Play(CalloutRequest request, CancellationToken ct)
 			try
 			{
 				request.CalloutAsset.ConfigureAudioSource(audioSource);
+				audioSource.volume *= request.Volume;
 				audioSource.Play();
 				await SoundAsset.WaitUntilAudioStops(audioSource, ct);
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
index ab08205c7..6fbd91c51 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequest.cs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System.Threading;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace VisualPinball.Unity
@@ -34,6 +32,7 @@ public struct CalloutRequest
 		public int Index { get; set; }
 
 		public readonly CalloutAsset CalloutAsset;
+		public readonly float Volume;
 		private readonly float _deadline;
 
 		/// <summary>
@@ -45,7 +44,8 @@ public struct CalloutRequest
 		public CalloutRequest(
 			CalloutAsset calloutAsset,
 			SoundPriority priority,
-			float maxQueueTime = -1f
+			float maxQueueTime = -1f,
+			float volume = 1f
 		)
 		{
 			CalloutAsset = calloutAsset;
@@ -55,6 +55,7 @@ public CalloutRequest(
 			else
 				_deadline = -1f;
 			Index = -1;
+			Volume = volume;
 		}
 
 		public readonly bool IsExpired()
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 043340cc4..cc58c9bf2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -33,5 +33,11 @@ public class MusicAsset : SoundAsset
 		[SerializeField]
 		[Range(0f, 1f)]
 		private float _volume = 1f;
+
+		public override void ConfigureAudioSource(AudioSource audioSource)
+		{
+			base.ConfigureAudioSource(audioSource);
+			audioSource.volume = _volume;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index fa2658bf9..6e243e8c1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -80,7 +80,8 @@ private void EvaluateRequestStack()
 			if (_requestStack.Count > 0)
 			{
 				_requestStack.Sort();
-				var musicToPlay = _requestStack[0].MusicAsset;
+				var requestToPlay = _requestStack[0];
+				var musicToPlay = requestToPlay.MusicAsset;
 				var playerToPlay = _players.FirstOrDefault(x => x.MusicAsset == musicToPlay);
 				if (playerToPlay == default)
 				{
@@ -96,6 +97,7 @@ private void EvaluateRequestStack()
 
 				// No need to fade in if nothing else is playing
 				playerToPlay.StartAtFullVolume = !_players.Any(x => x.IsPlaying);
+				playerToPlay.RequestVolume = requestToPlay.Volume;
 				_players.ForEach(x => x.ShouldPlay = x == playerToPlay);
 			}
 			else
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
index e1882d796..0a89d01fa 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicPlayer.cs
@@ -38,6 +38,11 @@ public enum AfterStopAction
 		public bool ShouldPlay { get; set; }
 		public bool IsPlaying => _audioSource != null && _audioSource.isPlaying;
 		public bool StartAtFullVolume { get; set; }
+
+		/// <summary>
+		/// The volume specified in the <c>MusicRequest</c> received by <c>MusicCoordinator</c>
+		/// </summary>
+		public float RequestVolume { get; set; } = 1f;
 		public MusicAsset MusicAsset { get; private set; }
 
 		private AudioSource _audioSource;
@@ -76,7 +81,9 @@ private void Update()
 				var oldVolume = _audioSource.volume;
 				MusicAsset.ConfigureAudioSource(_audioSource);
 				_audioSource.Play();
-				_audioSource.volume = StartAtFullVolume ? MusicAsset.Volume : oldVolume;
+				_audioSource.volume = StartAtFullVolume
+					? MusicAsset.Volume * RequestVolume
+					: oldVolume;
 			}
 			else if (!ShouldPlay && _audioSource.isPlaying && _audioSource.volume == 0f)
 			{
@@ -92,9 +99,10 @@ private void Update()
 						Destroy(gameObject);
 						break;
 				}
+				return;
 			}
 
-			var targetVolume = ShouldPlay ? MusicAsset.Volume : 0f;
+			var targetVolume = ShouldPlay ? MusicAsset.Volume * RequestVolume : 0f;
 			if (_audioSource.volume != targetVolume)
 			{
 				if (_fadeDuration == 0f)
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
index a69ea1065..9b68c704a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequest.cs
@@ -24,15 +24,21 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public struct MusicRequest : IComparable<MusicRequest>
 	{
-		public MusicRequest(MusicAsset musicAsset, SoundPriority priority = SoundPriority.Medium)
+		public MusicRequest(
+			MusicAsset musicAsset,
+			SoundPriority priority = SoundPriority.Medium,
+			float volume = 1f
+		)
 		{
 			MusicAsset = musicAsset;
 			Priority = priority;
 			Index = -1;
+			Volume = volume;
 		}
 
 		public readonly MusicAsset MusicAsset;
 		public readonly SoundPriority Priority;
+		public readonly float Volume;
 
 		/// <summary>
 		/// The <c>MusicCoordinator</c> sets the <c>Index</c> of the <c>n</c>th request it receives
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
index ad3e69e1d..f667f000e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -29,13 +29,16 @@ public class MusicRequester : MonoBehaviour
 		[SerializeField]
 		private SoundPriority _priority = SoundPriority.Medium;
 
+		[SerializeField]
+		private float _volume = 1f;
+
 		private int requestId;
 
 		private MusicCoordinator _coordinator;
 
 		private void OnEnable()
 		{
-			var request = new MusicRequest(_musicAsset, _priority);
+			var request = new MusicRequest(_musicAsset, _priority, _volume);
 			_coordinator = GetComponentInParent<MusicCoordinator>();
 			_coordinator.AddRequest(request, out requestId);
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index 28cceb5bd..cc89cb271 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -17,10 +17,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 using NLog;
 using UnityEngine;
-using UnityEngine.Video;
 using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
@@ -103,14 +101,15 @@ protected async void StartSound()
 					var request = new CalloutRequest(
 						(CalloutAsset)_soundAsset,
 						_priority,
-						_maxQueueTime
+						_maxQueueTime,
+						_volume
 					);
 					_calloutCoordinator.EnqueueCallout(request, out var requestId);
 					_calloutRequestIds.Add(requestId);
 				}
 				else if (_soundAsset is MusicAsset)
 				{
-					var request = new MusicRequest((MusicAsset)_soundAsset, _priority);
+					var request = new MusicRequest((MusicAsset)_soundAsset, _priority, _volume);
 					_musicCoordinator.AddRequest(request, out var requestId);
 					_musicRequestIds.Add(requestId);
 				}

From 651a77413b196a012420722f9749be34a23cf793 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Fri, 14 Feb 2025 22:08:14 +0100
Subject: [PATCH 41/53] Add GetRequestStatus to CalloutCoordinator

---
 .../Sound/CalloutCoordinator.cs               | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index e05cad56c..1c1a78088 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -16,6 +16,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NLog;
@@ -24,6 +25,14 @@
 
 namespace VisualPinball.Unity
 {
+	public enum CalloutRequestStatus
+	{
+		UnknownId,
+		Queued,
+		Playing,
+		Finished,
+	}
+
 	/// <summary>
 	/// Manages playback of callouts. Maintains a queue of callout requests. Supports prioritizing
 	/// certain callouts over others and enforcing a minimum pause between two callouts.
@@ -60,24 +69,41 @@ public void EnqueueCallout(CalloutRequest request, out int requestId)
 
 		public void DequeueCallout(int requestId)
 		{
-			var index = _calloutQ.FindIndex(x => x.Index == requestId);
-			if (index != -1)
-				_calloutQ.RemoveAt(index);
-			else if (
-				_idOfCurrentlyPlayingRequest != -1
-				&& requestId == _idOfCurrentlyPlayingRequest
-			)
-				_currentCalloutCts.Cancel();
-			else if (requestId >= 0 && requestId <= _requestCounter)
-				Logger.Info(
-					$"Cannot dequeue callout request with id '{requestId}' because it already "
-						+ "finished playing."
-				);
+			var status = GetRequestStatus(requestId);
+			switch (status)
+			{
+				case CalloutRequestStatus.Queued:
+					var index = _calloutQ.FindIndex(x => x.Index == requestId);
+					_calloutQ.RemoveAt(index);
+					break;
+				case CalloutRequestStatus.Playing:
+					_currentCalloutCts.Cancel();
+					break;
+				case CalloutRequestStatus.Finished:
+					Logger.Info(
+						$"Cannot dequeue callout request with id '{requestId}' because it already "
+							+ "finished playing."
+					);
+					break;
+				case CalloutRequestStatus.UnknownId:
+					Logger.Error(
+						$"Cannot dequeue callout request with id '{requestId}' because no such "
+							+ "request was previously made."
+					);
+					break;
+			}
+		}
+
+		public CalloutRequestStatus GetRequestStatus(int requestId)
+		{
+			if (requestId < 0 || requestId >= _requestCounter)
+				return CalloutRequestStatus.UnknownId;
+			else if (_calloutQ.Any(x => x.Index == requestId))
+				return CalloutRequestStatus.Queued;
+			else if (requestId == _idOfCurrentlyPlayingRequest)
+				return CalloutRequestStatus.Playing;
 			else
-				Logger.Error(
-					$"Cannot dequeue callout request with id '{requestId}' because no such request "
-						+ "was previously made."
-				);
+				return CalloutRequestStatus.Finished;
 		}
 
 		private void OnEnable()

From 11d174a26d058eee09b2f31ec52726e5d3c5cfbb Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Fri, 14 Feb 2025 22:12:58 +0100
Subject: [PATCH 42/53] Remove unneccessary else statements

---
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index 1c1a78088..ee6ff33fd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -98,12 +98,11 @@ public CalloutRequestStatus GetRequestStatus(int requestId)
 		{
 			if (requestId < 0 || requestId >= _requestCounter)
 				return CalloutRequestStatus.UnknownId;
-			else if (_calloutQ.Any(x => x.Index == requestId))
+			if (_calloutQ.Any(x => x.Index == requestId))
 				return CalloutRequestStatus.Queued;
-			else if (requestId == _idOfCurrentlyPlayingRequest)
+			if (requestId == _idOfCurrentlyPlayingRequest)
 				return CalloutRequestStatus.Playing;
-			else
-				return CalloutRequestStatus.Finished;
+			return CalloutRequestStatus.Finished;
 		}
 
 		private void OnEnable()

From 6a1f86ceb4091dd01079d0068412c262cc0ae1a8 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Sat, 15 Feb 2025 14:47:45 +0100
Subject: [PATCH 43/53] Add MultiPlayMode setting and refactor

---
 .../Sound/SoundComponentInspector.cs          |  23 ++-
 .../Sound/SoundComponentInspector.uxml        |   5 +-
 .../Sound/MusicCoordinator.cs                 |  19 +++
 .../VisualPinball.Unity/Sound/SoundAsset.cs   |   3 +
 .../Sound/SoundComponent.cs                   | 148 ++++++++++-------
 .../Sound/SoundComponentSoundPlayer.cs        | 153 ++++++++++++++++++
 .../Sound/SoundComponentSoundPlayer.cs.meta   |  11 ++
 .../Sound/SoundEffectAsset.cs                 |  63 +++++---
 8 files changed, 340 insertions(+), 85 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index 7f44ba79d..19ff44ab5 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -43,18 +43,29 @@ private void ConfigureFieldVisibility(VisualElement container)
 			var soundAssetProp = serializedObject.FindProperty("_soundAsset");
 			var calloutFields = container.Q<VisualElement>("callout-fields");
 			var musicFields = container.Q<VisualElement>("music-fields");
+			var effectFields = container.Q<VisualElement>("sound-effect-fields");
 			UpdateFieldVisibility(soundAssetProp);
 			var soundAssetField = container.Q<PropertyField>("sound-asset");
 			soundAssetField.TrackPropertyValue(soundAssetProp, UpdateFieldVisibility);
 
 			void UpdateFieldVisibility(SerializedProperty prop)
 			{
-				var isCalloutAsset = soundAssetProp.objectReferenceValue is CalloutAsset;
-				calloutFields.style.display = isCalloutAsset
-					? DisplayStyle.Flex
-					: DisplayStyle.None;
-				var isMusicAsset = soundAssetProp.objectReferenceValue is MusicAsset;
-				musicFields.style.display = isMusicAsset ? DisplayStyle.Flex : DisplayStyle.None;
+				var soundAsset = prop.objectReferenceValue as SoundAsset;
+				if (soundAsset == null)
+				{
+					calloutFields.style.display = DisplayStyle.None;
+					musicFields.style.display = DisplayStyle.None;
+					effectFields.style.display = DisplayStyle.None;
+				}
+				else
+				{
+					calloutFields.style.display =
+						soundAsset is CalloutAsset ? DisplayStyle.Flex : DisplayStyle.None;
+					musicFields.style.display =
+						soundAsset is MusicAsset ? DisplayStyle.Flex : DisplayStyle.None;
+					effectFields.style.display =
+						soundAsset is SoundEffectAsset ? DisplayStyle.Flex : DisplayStyle.None;
+				}
 			}
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
index 34c3d0db1..2a05d524e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
@@ -1,12 +1,15 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <uie:PropertyField name="sound-asset" binding-path="_soundAsset" label="Sound Asset" />
-    <uie:PropertyField name="interrupt" binding-path="_interrupt" label="Interrupt" />
     <uie:PropertyField name="volume" binding-path="_volume" label="Volume" />
     <ui:VisualElement name="callout-fields" style="flex-grow: 1;">
         <uie:PropertyField name="priority" binding-path="_priority" label="Priority" />
         <uie:PropertyField name="max-queue-time" binding-path="_maxQueueTime" label="Max Queue Time" tooltip="How many seconds to wait in the queue before discarding the request. -1 = no limit" />
+        <uie:PropertyField name="multi-play-mode" binding-path="_multiPlayMode" label="Multi Play Mode" tooltip="What to do when the callout is still playing or in the queue when it is triggered again. Play In Parallel: Keep the previous callout in the queue and enqueue it again, Do Not Play: Keep the previous callout request and don't enqueue a new one, Fade Out Previous: Since you have selected a callout asset, this is the same as 'Stop Previous', Stop Previous: Immediately stop the previous callout and start a new one. This means the callout goes to the back of the queue. It might not be played immediately." />
     </ui:VisualElement>
     <ui:VisualElement name="music-fields" style="flex-grow: 1;">
         <uie:PropertyField name="priority" binding-path="_priority" label="Priority" />
     </ui:VisualElement>
+    <ui:VisualElement name="sound-effect-fields" style="flex-grow: 1;">
+        <uie:PropertyField name="multi-play-mode" binding-path="_multiPlayMode" label="Multi Play Mode" tooltip="What to do when the sound effect is still playing when it is triggered again. Play In Parallel: Keep playing the previous sound effect and start another one at the same time, Do Not Play: Keep playing the previous sound effect and don't start another one, Fade Out Previous: Fade out the previous sound effect while starting a new one. If the sound effect is not a looping sound or its fade out time is zero, this is the same as 'Stop Previous,' Stop Previous: Immediately stop the previous sound effect and start a new one." />
+    </ui:VisualElement>
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index 6e243e8c1..e25d9b78d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -23,6 +23,14 @@
 
 namespace VisualPinball.Unity
 {
+	public enum MusicRequestStatus
+	{
+		UnknownId,
+		Waiting,
+		Playing,
+		Finished,
+	}
+
 	/// <summary>
 	/// Manages music playback using a stack. Other scripts can add requests to the stack.
 	/// The stack is sorted based on priority and age of the requests. The topmost request is
@@ -74,6 +82,17 @@ public void RemoveRequest(int requestId)
 			EvaluateRequestStack();
 		}
 
+		public MusicRequestStatus GetRequestStatus(int requestId)
+		{
+			if (requestId < 0 || requestId >= _requestCounter)
+				return MusicRequestStatus.UnknownId;
+			if (_requestStack.Any(x => x.Index == requestId))
+				return MusicRequestStatus.Waiting;
+			if (_requestStack.Count > 0 && requestId == _requestStack[0].Index)
+				return MusicRequestStatus.Playing;
+			return MusicRequestStatus.Finished;
+		}
+
 		private void EvaluateRequestStack()
 		{
 			_players.RemoveAll(x => x == null);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index 22ba9434d..24c2cbde8 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -113,6 +113,8 @@ private AudioClip GetClip()
 		/// </summary>
 		public static bool HasStopped(AudioSource audioSource)
 		{
+			if (audioSource == null)
+				return true;
 			if (audioSource.isPlaying)
 				return false;
 #if UNITY_EDITOR
@@ -124,6 +126,7 @@ public static bool HasStopped(AudioSource audioSource)
 
 		public static async Task WaitUntilAudioStops(AudioSource audioSource, CancellationToken ct)
 		{
+			ct.ThrowIfCancellationRequested();
 			while (!HasStopped(audioSource))
 			{
 				await Task.Yield();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index cc89cb271..abdad7bcd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -16,7 +16,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
+using System.Linq;
 using NLog;
 using UnityEngine;
 using Logger = NLog.Logger;
@@ -29,12 +29,19 @@ namespace VisualPinball.Unity
 	[AddComponentMenu("Visual Pinball/Sound/Sound")]
 	public class SoundComponent : EnableAfterAwakeComponent
 	{
+		private enum MultiPlayMode
+		{
+			PlayInParallel,
+			DoNotPlay,
+			FadeOutPrevious,
+			StopPrevious,
+		}
+
 		[SerializeReference]
 		protected SoundAsset _soundAsset;
 
 		[SerializeField]
-		[Tooltip("Should the sound be interrupted if it is triggered again while already playing?")]
-		protected bool _interrupt;
+		private MultiPlayMode _multiPlayMode;
 
 		[SerializeField, Range(0f, 1f)]
 		private float _volume = 1f;
@@ -45,14 +52,17 @@ public class SoundComponent : EnableAfterAwakeComponent
 		[SerializeField]
 		private float _maxQueueTime = -1;
 
-		private CancellationTokenSource _instantCts;
-		private CancellationTokenSource _allowFadeCts;
 		private CalloutCoordinator _calloutCoordinator;
-		private List<int> _calloutRequestIds = new();
 		private MusicCoordinator _musicCoordinator;
-		private List<int> _musicRequestIds = new();
+		private readonly List<SoundCommponentSoundPlayer> _soundPlayers = new();
+
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
+		public bool IsPlayingOrRequestingSound()
+		{
+			return _soundPlayers.Any(x => x.IsPlayingOrRequestingSound());
+		}
+
 		protected override void OnEnableAfterAfterAwake()
 		{
 			base.OnEnableAfterAfterAwake();
@@ -60,12 +70,24 @@ protected override void OnEnableAfterAfterAwake()
 			_musicCoordinator = GetComponentInParent<MusicCoordinator>();
 		}
 
+		protected void Update()
+		{
+			for (int i = _soundPlayers.Count - 1; i >= 0; i--)
+			{
+				if (!_soundPlayers[i].IsPlayingOrRequestingSound())
+				{
+					Destroy(_soundPlayers[i]);
+					_soundPlayers.RemoveAt(i);
+				}
+			}
+		}
+
 		protected virtual void OnDisable()
 		{
 			StopAllSounds(allowFade: true);
 		}
 
-		protected async void StartSound()
+		protected void StartSound()
 		{
 			if (!isActiveAndEnabled)
 			{
@@ -79,69 +101,75 @@ protected async void StartSound()
 				return;
 			}
 
-			if (_interrupt)
-				StopAllSounds(allowFade: true);
-
-			_allowFadeCts ??= new();
-			_instantCts ??= new();
-
-			try
+			if (IsPlayingOrRequestingSound())
 			{
-				if (_soundAsset is SoundEffectAsset)
+				if (_soundAsset is MusicAsset)
 				{
-					await ((SoundEffectAsset)_soundAsset).Play(
-						gameObject,
-						_allowFadeCts.Token,
-						_instantCts.Token,
-						_volume
-					);
-				}
-				else if (_soundAsset is CalloutAsset)
-				{
-					var request = new CalloutRequest(
-						(CalloutAsset)_soundAsset,
-						_priority,
-						_maxQueueTime,
-						_volume
-					);
-					_calloutCoordinator.EnqueueCallout(request, out var requestId);
-					_calloutRequestIds.Add(requestId);
-				}
-				else if (_soundAsset is MusicAsset)
-				{
-					var request = new MusicRequest((MusicAsset)_soundAsset, _priority, _volume);
-					_musicCoordinator.AddRequest(request, out var requestId);
-					_musicRequestIds.Add(requestId);
+					// We never want to have multiple active music requests. Makes no sense.
+					StopAllSounds(allowFade: true);
 				}
 				else
 				{
-					throw new NotImplementedException(
-						$"Unknown type of sound asset '{_soundAsset.GetType()}'"
-					);
+					switch (_multiPlayMode)
+					{
+						case MultiPlayMode.PlayInParallel:
+							// Don't need to do anything.
+							break;
+						case MultiPlayMode.DoNotPlay:
+							return;
+						case MultiPlayMode.FadeOutPrevious:
+							StopAllSounds(allowFade: true);
+							break;
+						case MultiPlayMode.StopPrevious:
+							StopAllSounds(allowFade: false);
+							break;
+					}
 				}
 			}
-			catch (OperationCanceledException) { }
+
+			var player = CreateSoundPlayer();
+			player.StartSound(_volume);
+			_soundPlayers.Add(player);
 		}
 
 		protected void StopAllSounds(bool allowFade)
 		{
-			if (allowFade)
-				_allowFadeCts?.Cancel();
-			else
-				_instantCts?.Cancel();
-
-			_allowFadeCts?.Dispose();
-			_allowFadeCts = null;
-			_instantCts?.Dispose();
-			_instantCts = null;
-
-			foreach (var id in _calloutRequestIds)
-				_calloutCoordinator.DequeueCallout(id);
-			_calloutRequestIds.Clear();
-
-			foreach (var id in _musicRequestIds)
-				_musicCoordinator.RemoveRequest(id);
-			_musicRequestIds.Clear();
+			_soundPlayers.ForEach(x => x.StopSound(allowFade));
+		}
+
+		private SoundCommponentSoundPlayer CreateSoundPlayer()
+		{
+			if (_soundAsset is SoundEffectAsset)
+			{
+				var player = gameObject.AddComponent<SoundComponentSoundEffectPlayer>();
+				player.Init((SoundEffectAsset)_soundAsset);
+				return player;
+			}
+
+			if (_soundAsset is CalloutAsset)
+			{
+				var request = new CalloutRequest(
+					(CalloutAsset)_soundAsset,
+					_priority,
+					_maxQueueTime,
+					_volume
+				);
+				var player = gameObject.AddComponent<SoundComponentCalloutPlayer>();
+				player.Init(request, _calloutCoordinator);
+				return player;
+			}
+
+			if (_soundAsset is MusicAsset)
+			{
+				var request = new MusicRequest((MusicAsset)_soundAsset, _priority, _volume);
+				var player = gameObject.AddComponent<SoundComponentMusicPlayer>();
+				player.Init(request, _musicCoordinator);
+				return player;
+			}
+
+			throw new NotImplementedException(
+				$"Unknown type of sound asset '{_soundAsset.GetType()}'"
+			);
 		}
 
 		public virtual bool SupportsLoopingSoundAssets() => true;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
new file mode 100644
index 000000000..c40ed3887
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
@@ -0,0 +1,153 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	/// <summary>
+	/// Single use object to manage the playback of a music, callout, or sound effect asset
+	/// </summary>
+	public abstract class SoundCommponentSoundPlayer : MonoBehaviour
+	{
+		public abstract void StartSound(float volume = 10f);
+		public abstract void StopSound(bool allowFade);
+		public abstract bool IsPlayingOrRequestingSound();
+	}
+
+	public class SoundComponentSoundEffectPlayer : SoundCommponentSoundPlayer
+	{
+		private SoundEffectAsset _soundEffectAsset;
+		private CancellationTokenSource _allowFadeCts;
+		private CancellationTokenSource _instantFadeCts;
+		private Task _playTask;
+
+		public void Init(SoundEffectAsset soundEffectAsset)
+		{
+			_soundEffectAsset = soundEffectAsset;
+			_allowFadeCts = new CancellationTokenSource();
+			_instantFadeCts = new CancellationTokenSource();
+		}
+
+		public override async void StartSound(float volume)
+		{
+			_playTask = _soundEffectAsset.Play(
+				gameObject,
+				_allowFadeCts.Token,
+				_instantFadeCts.Token,
+				volume
+			);
+
+			try
+			{
+				await _playTask;
+			}
+			catch (OperationCanceledException) { }
+		}
+
+		public override void StopSound(bool allowFade)
+		{
+			var ctsToCancel = allowFade ? _allowFadeCts : _instantFadeCts;
+			ctsToCancel.Cancel();
+		}
+
+		public override bool IsPlayingOrRequestingSound()
+		{
+			return _playTask != null && !_playTask.IsCompleted;
+		}
+
+		private void OnDestroy()
+		{
+			_allowFadeCts.Dispose();
+			_instantFadeCts.Dispose();
+		}
+	}
+
+	public class SoundComponentMusicPlayer : SoundCommponentSoundPlayer
+	{
+		private MusicRequest _request;
+		private MusicCoordinator _coordinator;
+		private int _requestId = -1;
+
+		public void Init(MusicRequest request, MusicCoordinator coordinator)
+		{
+			_request = request;
+			_coordinator = coordinator;
+		}
+
+		public override void StartSound(float volume)
+		{
+			_coordinator.AddRequest(_request, out _requestId);
+		}
+
+		public override bool IsPlayingOrRequestingSound()
+		{
+			return _coordinator.GetRequestStatus(_requestId)
+				is MusicRequestStatus.Waiting
+					or MusicRequestStatus.Playing;
+		}
+
+		public override void StopSound(bool allowFade)
+		{
+			_coordinator.RemoveRequest(_requestId);
+		}
+
+		private void OnDestroy()
+		{
+			if (_coordinator != null && IsPlayingOrRequestingSound())
+				_coordinator.RemoveRequest(_requestId);
+		}
+	}
+
+	public class SoundComponentCalloutPlayer : SoundCommponentSoundPlayer
+	{
+		private CalloutRequest _request;
+		private CalloutCoordinator _coordinator;
+		private int _requestId = -1;
+
+		public void Init(CalloutRequest request, CalloutCoordinator coordinator)
+		{
+			_request = request;
+			_coordinator = coordinator;
+		}
+
+		public override void StartSound(float volume = 10)
+		{
+			_coordinator.EnqueueCallout(_request, out _requestId);
+		}
+
+		public override void StopSound(bool allowFade)
+		{
+			_coordinator.DequeueCallout(_requestId);
+		}
+
+		public override bool IsPlayingOrRequestingSound()
+		{
+			return _coordinator.GetRequestStatus(_requestId)
+				is CalloutRequestStatus.Queued
+					or CalloutRequestStatus.Playing;
+		}
+
+		private void OnDestroy()
+		{
+			if (_coordinator != null && IsPlayingOrRequestingSound())
+				_coordinator.DequeueCallout(_requestId);
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs.meta
new file mode 100644
index 000000000..f568fde6a
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d6d34227b5cb9c243b5fe62262cd505c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index ffe43038b..689114074 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -70,7 +70,7 @@ public class SoundEffectAsset : SoundAsset
 		private float _cooldown = 0.02f;
 
 		[NonSerialized]
-		private float _lastPlayStartTime = float.NegativeInfinity;
+		private float _lastPlayStartTime = -1f;
 
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -102,8 +102,8 @@ public async Task Play(
 				);
 				return;
 			}
-
 			_lastPlayStartTime = Time.unscaledTime;
+
 			var audioSource = audioObj.AddComponent<AudioSource>();
 
 			try
@@ -116,25 +116,29 @@ public async Task Play(
 					instantCt
 				);
 
-				var waitUntilStopTask = WaitUntilAudioStops(audioSource, eitherCts.Token);
-
 				// Fade in
 				if (_loop && _fadeInTime > 0f)
 				{
-					var fadeTask = Fade(
-						audioSource,
-						0f,
-						audioSource.volume,
-						_fadeInTime,
-						eitherCts.Token
-					);
-					await Task.WhenAny(waitUntilStopTask, fadeTask);
+					try
+					{
+						await FadeOrFinish(
+							audioSource,
+							0f,
+							audioSource.volume,
+							_fadeInTime,
+							eitherCts.Token
+						);
+					}
+					catch (OperationCanceledException)
+					{
+						instantCt.ThrowIfCancellationRequested();
+					}
 				}
 
 				// Play until sound stops or cancellation is requested
 				try
 				{
-					await waitUntilStopTask;
+					await WaitUntilAudioStops(audioSource, eitherCts.Token);
 				}
 				catch (OperationCanceledException)
 				{
@@ -142,17 +146,15 @@ public async Task Play(
 					// Fade out
 					if (_loop && _fadeOutTime > 0f)
 					{
-						var fadeTask = Fade(
+						await FadeOrFinish(
 							audioSource,
 							audioSource.volume,
 							0f,
 							_fadeOutTime,
 							instantCt
 						);
-						waitUntilStopTask = WaitUntilAudioStops(audioSource, instantCt);
-						await Task.WhenAny(waitUntilStopTask, fadeTask);
-						allowFadeOutCt.ThrowIfCancellationRequested();
 					}
+					allowFadeOutCt.ThrowIfCancellationRequested();
 				}
 			}
 			finally
@@ -167,6 +169,31 @@ public async Task Play(
 			}
 		}
 
+		public static async Task FadeOrFinish(
+			AudioSource audioSource,
+			float fromVolume,
+			float toVolume,
+			float duration,
+			CancellationToken ct
+		)
+		{
+			using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+
+			var waitUntilStopTask = WaitUntilAudioStops(audioSource, cts.Token);
+			var fadeTask = Fade(audioSource, fromVolume, toVolume, duration, cts.Token);
+
+			var completedTask = await Task.WhenAny(waitUntilStopTask, fadeTask);
+			cts.Cancel();
+			try
+			{
+				await Task.WhenAll(waitUntilStopTask, fadeTask);
+			}
+			catch (OperationCanceledException)
+			{
+				ct.ThrowIfCancellationRequested();
+			}
+		}
+
 		public static async Task Fade(
 			AudioSource audioSource,
 			float fromVolume,
@@ -180,7 +207,7 @@ CancellationToken ct
 			// Time.deltaTime doesn't really work in the editor outside play mode
 			var lastTime = EditorApplication.timeSinceStartup;
 #endif
-			while (progress < 1f)
+			while (progress < 1f && audioSource != null)
 			{
 				ct.ThrowIfCancellationRequested();
 				audioSource.volume = Mathf.Lerp(fromVolume, toVolume, progress);

From aa4ae436b8ae7ed8911ff5de5336d7ad6a89f5f3 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Sat, 15 Feb 2025 19:14:34 +0100
Subject: [PATCH 44/53] Do not use MonoBehaviour for SoundComponentSoundPlayer
 types

---
 .../Sound/SoundComponent.cs                   | 27 +++---
 .../Sound/SoundComponentSoundPlayer.cs        | 92 +++++++++++--------
 2 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index abdad7bcd..05876fe06 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -54,7 +54,7 @@ private enum MultiPlayMode
 
 		private CalloutCoordinator _calloutCoordinator;
 		private MusicCoordinator _musicCoordinator;
-		private readonly List<SoundCommponentSoundPlayer> _soundPlayers = new();
+		private readonly List<ISoundCommponentSoundPlayer> _soundPlayers = new();
 
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -76,7 +76,7 @@ protected void Update()
 			{
 				if (!_soundPlayers[i].IsPlayingOrRequestingSound())
 				{
-					Destroy(_soundPlayers[i]);
+					_soundPlayers[i].Dispose();
 					_soundPlayers.RemoveAt(i);
 				}
 			}
@@ -87,6 +87,12 @@ protected virtual void OnDisable()
 			StopAllSounds(allowFade: true);
 		}
 
+		protected virtual void OnDestroy()
+		{
+			StopAllSounds(allowFade: false);
+			_soundPlayers.ForEach(x => x.Dispose());
+		}
+
 		protected void StartSound()
 		{
 			if (!isActiveAndEnabled)
@@ -137,13 +143,14 @@ protected void StopAllSounds(bool allowFade)
 			_soundPlayers.ForEach(x => x.StopSound(allowFade));
 		}
 
-		private SoundCommponentSoundPlayer CreateSoundPlayer()
+		private ISoundCommponentSoundPlayer CreateSoundPlayer()
 		{
 			if (_soundAsset is SoundEffectAsset)
 			{
-				var player = gameObject.AddComponent<SoundComponentSoundEffectPlayer>();
-				player.Init((SoundEffectAsset)_soundAsset);
-				return player;
+				return new SoundComponentSoundEffectPlayer(
+					(SoundEffectAsset)_soundAsset,
+					gameObject
+				);
 			}
 
 			if (_soundAsset is CalloutAsset)
@@ -154,17 +161,13 @@ private SoundCommponentSoundPlayer CreateSoundPlayer()
 					_maxQueueTime,
 					_volume
 				);
-				var player = gameObject.AddComponent<SoundComponentCalloutPlayer>();
-				player.Init(request, _calloutCoordinator);
-				return player;
+				return new SoundComponentCalloutPlayer(request, _calloutCoordinator);
 			}
 
 			if (_soundAsset is MusicAsset)
 			{
 				var request = new MusicRequest((MusicAsset)_soundAsset, _priority, _volume);
-				var player = gameObject.AddComponent<SoundComponentMusicPlayer>();
-				player.Init(request, _musicCoordinator);
-				return player;
+				return new SoundComponentMusicPlayer(request, _musicCoordinator);
 			}
 
 			throw new NotImplementedException(
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
index c40ed3887..f135bacac 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
@@ -22,33 +22,43 @@
 namespace VisualPinball.Unity
 {
 	/// <summary>
-	/// Single use object to manage the playback of a music, callout, or sound effect asset
+	/// Single use object to manage the playback of a music, callout, or sound effect asset in the
+	/// context of a <c>SoundComponent</c>
 	/// </summary>
-	public abstract class SoundCommponentSoundPlayer : MonoBehaviour
+	public interface ISoundCommponentSoundPlayer : IDisposable
 	{
-		public abstract void StartSound(float volume = 10f);
-		public abstract void StopSound(bool allowFade);
-		public abstract bool IsPlayingOrRequestingSound();
+		public void StartSound(float volume = 10f);
+		public void StopSound(bool allowFade);
+		public bool IsPlayingOrRequestingSound();
 	}
 
-	public class SoundComponentSoundEffectPlayer : SoundCommponentSoundPlayer
+	/// <summary>
+	/// Single use object to manage the playback of a sound effect asset in the context of a
+	/// <c>SoundComponent</c>
+	/// </summary>
+	public class SoundComponentSoundEffectPlayer : ISoundCommponentSoundPlayer
 	{
 		private SoundEffectAsset _soundEffectAsset;
+		private GameObject _audioSourceGo;
 		private CancellationTokenSource _allowFadeCts;
 		private CancellationTokenSource _instantFadeCts;
 		private Task _playTask;
 
-		public void Init(SoundEffectAsset soundEffectAsset)
+		public SoundComponentSoundEffectPlayer(
+			SoundEffectAsset soundEffectAsset,
+			GameObject audioSourceGo
+		)
 		{
 			_soundEffectAsset = soundEffectAsset;
+			_audioSourceGo = audioSourceGo;
 			_allowFadeCts = new CancellationTokenSource();
 			_instantFadeCts = new CancellationTokenSource();
 		}
 
-		public override async void StartSound(float volume)
+		public async void StartSound(float volume)
 		{
 			_playTask = _soundEffectAsset.Play(
-				gameObject,
+				_audioSourceGo,
 				_allowFadeCts.Token,
 				_instantFadeCts.Token,
 				volume
@@ -61,93 +71,97 @@ public override async void StartSound(float volume)
 			catch (OperationCanceledException) { }
 		}
 
-		public override void StopSound(bool allowFade)
+		public void StopSound(bool allowFade)
 		{
 			var ctsToCancel = allowFade ? _allowFadeCts : _instantFadeCts;
 			ctsToCancel.Cancel();
 		}
 
-		public override bool IsPlayingOrRequestingSound()
+		public bool IsPlayingOrRequestingSound()
 		{
 			return _playTask != null && !_playTask.IsCompleted;
 		}
 
-		private void OnDestroy()
+		public void Dispose()
 		{
 			_allowFadeCts.Dispose();
 			_instantFadeCts.Dispose();
 		}
 	}
 
-	public class SoundComponentMusicPlayer : SoundCommponentSoundPlayer
+	/// <summary>
+	/// Single use object to manage the playback of a music asset in the context of a
+	/// <c>SoundComponent</c>
+	/// </summary>
+	public class SoundComponentMusicPlayer : ISoundCommponentSoundPlayer
 	{
 		private MusicRequest _request;
 		private MusicCoordinator _coordinator;
 		private int _requestId = -1;
 
-		public void Init(MusicRequest request, MusicCoordinator coordinator)
+		public SoundComponentMusicPlayer(MusicRequest request, MusicCoordinator coordinator)
 		{
 			_request = request;
 			_coordinator = coordinator;
 		}
 
-		public override void StartSound(float volume)
+		public void StartSound(float volume)
 		{
 			_coordinator.AddRequest(_request, out _requestId);
 		}
 
-		public override bool IsPlayingOrRequestingSound()
+		public bool IsPlayingOrRequestingSound()
 		{
-			return _coordinator.GetRequestStatus(_requestId)
-				is MusicRequestStatus.Waiting
-					or MusicRequestStatus.Playing;
+			return _requestId != -1
+				&& _coordinator.GetRequestStatus(_requestId)
+					is MusicRequestStatus.Waiting
+						or MusicRequestStatus.Playing;
 		}
 
-		public override void StopSound(bool allowFade)
-		{
-			_coordinator.RemoveRequest(_requestId);
-		}
-
-		private void OnDestroy()
+		public void StopSound(bool allowFade)
 		{
 			if (_coordinator != null && IsPlayingOrRequestingSound())
 				_coordinator.RemoveRequest(_requestId);
 		}
+
+		public void Dispose() { }
 	}
 
-	public class SoundComponentCalloutPlayer : SoundCommponentSoundPlayer
+	/// <summary>
+	/// Single use object to manage the playback of a callout asset in the context of a
+	/// <c>SoundComponent</c>
+	/// </summary>
+	public class SoundComponentCalloutPlayer : ISoundCommponentSoundPlayer
 	{
 		private CalloutRequest _request;
 		private CalloutCoordinator _coordinator;
 		private int _requestId = -1;
 
-		public void Init(CalloutRequest request, CalloutCoordinator coordinator)
+		public SoundComponentCalloutPlayer(CalloutRequest request, CalloutCoordinator coordinator)
 		{
 			_request = request;
 			_coordinator = coordinator;
 		}
 
-		public override void StartSound(float volume = 10)
+		public void StartSound(float volume = 10)
 		{
 			_coordinator.EnqueueCallout(_request, out _requestId);
 		}
 
-		public override void StopSound(bool allowFade)
+		public void StopSound(bool allowFade)
 		{
-			_coordinator.DequeueCallout(_requestId);
+			if (_coordinator != null && IsPlayingOrRequestingSound())
+				_coordinator.DequeueCallout(_requestId);
 		}
 
-		public override bool IsPlayingOrRequestingSound()
+		public bool IsPlayingOrRequestingSound()
 		{
-			return _coordinator.GetRequestStatus(_requestId)
-				is CalloutRequestStatus.Queued
-					or CalloutRequestStatus.Playing;
+			return _requestId != -1
+				&& _coordinator.GetRequestStatus(_requestId)
+					is CalloutRequestStatus.Queued
+						or CalloutRequestStatus.Playing;
 		}
 
-		private void OnDestroy()
-		{
-			if (_coordinator != null && IsPlayingOrRequestingSound())
-				_coordinator.DequeueCallout(_requestId);
-		}
+		public void Dispose() { }
 	}
 }

From 8be93323bfa5b1bcb764b48f82333b93f3bd5acb Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Tue, 25 Feb 2025 18:35:52 +0100
Subject: [PATCH 45/53] Event sound plays sound on event by default

---
 .../VisualPinball.Unity/Sound/EventSoundComponent.cs       | 7 +++++--
 .../VisualPinball.Unity/Sound/HitSoundComponent.cs         | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
index a9108abd0..b22797ef4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/EventSoundComponent.cs
@@ -17,18 +17,21 @@
 namespace VisualPinball.Unity
 {
 	/// <summary>
-	/// Start and or stop a sound when an event occurs.
+	/// Start a sound when an event occurs.
 	/// </summary>
 	public abstract class EventSoundComponent<TEventSource, TEventArgs> : SoundComponent
 		where TEventSource : class
 	{
 		private TEventSource _eventSource;
 
+		public override bool SupportsLoopingSoundAssets() => false;
+
 		protected abstract bool TryFindEventSource(out TEventSource eventSource);
-		protected abstract void OnEvent(object sender, TEventArgs e);
 		protected abstract void Subscribe(TEventSource eventSource);
 		protected abstract void Unsubscribe(TEventSource eventSource);
 
+		protected virtual void OnEvent(object sender, TEventArgs e) => StartSound();
+
 		protected override void OnEnableAfterAfterAwake()
 		{
 			base.OnEnableAfterAfterAwake();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
index ddbf5844e..a7c32fa9c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/HitSoundComponent.cs
@@ -45,8 +45,6 @@ protected override bool TryFindEventSource(out IApiHittable hittable)
 			return false;
 		}
 
-		protected override void OnEvent(object sender, HitEventArgs e) => StartSound();
-
 		protected override void Subscribe(IApiHittable eventSource) => eventSource.Hit += OnEvent;
 
 		protected override void Unsubscribe(IApiHittable eventSource) => eventSource.Hit -= OnEvent;

From e9bbab0b8de4d500d82fcfdc534e87610ee50dc0 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Tue, 25 Feb 2025 18:39:18 +0100
Subject: [PATCH 46/53] Fix gibberish tooltip

---
 .../Sound/SoundEffectAssetInspector.uxml                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
index 393083105..14f7e9ab7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.uxml
@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <uie:PropertyField name="type" binding-path="_type" label="Type" tooltip="In a real pinball machine, would this sound come from a mechanism (Mechanical) or from the speakers (Synthetic)?" class="unity-base-field__aligned" />
-    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" tooltip="sadfassdfsfd" />
+    <uie:PropertyField name="loop" binding-path="_loop" label="Loop" tooltip="Makes the sound loop until it is stopped" />
     <uie:PropertyField name="fade-in-time" binding-path="_fadeInTime" label="Fade In Time" />
     <uie:PropertyField name="fade-out-time" binding-path="_fadeOutTime" label="Fade Out Time" />
     <ui:MinMaxSlider label="Volume Range" min-value="1" max-value="1" low-limit="0" high-limit="1" tooltip="Volume will be randomized within this range (0 - 1)" binding-path="_volumeRange" name="volume-range" class="unity-base-field__aligned" />

From ae228c75007eaadc3ebed241f564f1a6bb5a6383 Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Tue, 25 Feb 2025 21:16:09 +0100
Subject: [PATCH 47/53] Log error if music or sound coordinator missing

---
 .../VisualPinball.Unity/Sound/SoundComponent.cs               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index 05876fe06..bb35571d4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -67,7 +67,11 @@ protected override void OnEnableAfterAfterAwake()
 		{
 			base.OnEnableAfterAfterAwake();
 			_calloutCoordinator = GetComponentInParent<CalloutCoordinator>();
+			if (_calloutCoordinator == null)
+				Logger.Error("No callout coordinator found in parents. Callouts will not work!");
 			_musicCoordinator = GetComponentInParent<MusicCoordinator>();
+			if (_musicCoordinator == null)
+				Logger.Error("No music coordinator found in parents. Music will not work!");
 		}
 
 		protected void Update()

From 1edaaf924a680214794e21bbba1cf0c9d4fad19c Mon Sep 17 00:00:00 2001
From: arthurkehrwald <50906979+arthurkehrwald@users.noreply.github.com>
Date: Thu, 27 Feb 2025 23:57:07 +0100
Subject: [PATCH 48/53] Patch packing of sound classes

---
 .../BinaryEventSoundComponentInspector.uxml   |  4 +-
 .../Sound/SoundAssetInspector.uxml            |  4 +-
 .../Sound/SoundComponentInspector.cs          |  8 +-
 .../Sound/SoundComponentInspector.uxml        | 12 +--
 .../Sound/BinaryEventSoundComponent.cs        |  3 -
 .../Sound/CalloutCoordinator.cs               |  9 +-
 .../Sound/CoilSoundComponent.cs               |  1 -
 .../Sound/MusicCoordinator.cs                 |  7 +-
 .../VisualPinball.Unity/Sound/SoundAsset.cs   | 21 ++---
 .../Sound/SoundComponent.cs                   | 83 +++++++++----------
 .../Sound/SoundComponentSoundPlayer.cs        |  8 +-
 .../Sound/SoundPackable.cs                    | 64 ++++++++++++--
 .../Sound/SwitchSoundComponent.cs             |  1 -
 13 files changed, 131 insertions(+), 94 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
index 2422c9619..60ab4349f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
@@ -1,4 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:PropertyField binding-path="_startWhen" label="Start When" tooltip="When to start playing the sound" />
-    <uie:PropertyField binding-path="_stopWhen" label="Stop When" tooltip="When to stop playing the sound" />
+    <uie:PropertyField binding-path="StartWhen" label="Start When" tooltip="When to start playing the sound" />
+    <uie:PropertyField binding-path="StopWhen" label="Stop When" tooltip="When to stop playing the sound" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
index 803fa3d8d..54ed896fe 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.uxml
@@ -1,7 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <Style src="project://database/Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/Common/MultilineTextField.uss?fileID=7433441132597879392&amp;guid=443092b513c6ebc4bbfbfe7de8daa864&amp;type=3#MultilineTextField" />
-    <ui:TextField picking-mode="Ignore" label="Description" multiline="true" binding-path="Description" name="description" class="multiline-textfield unity-base-field__aligned" />
+    <ui:TextField picking-mode="Ignore" label="Description" multiline="true" binding-path="_description" name="description" class="multiline-textfield unity-base-field__aligned" />
     <uie:PropertyField name="clips" binding-path="Clips" label="Clips" />
-    <uie:PropertyField name="clip-selection-method" binding-path="ClipSelectionMethod" label="Clip Selection Method" />
+    <uie:PropertyField name="clip-selection-method" binding-path="_clipSelectionMethod" label="Clip Selection Method" />
     <uie:ObjectField label="Audio Mixer Group" binding-path="_audioMixerGroup" name="audio-mixer-group" type="UnityEngine.Audio.AudioMixerGroup, UnityEngine.AudioModule" class="unity-base-field__aligned" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index 6626241bd..b2a87b48a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -40,7 +40,7 @@ public override VisualElement CreateInspectorGUI()
 
 		private void ConfigureFieldVisibility(VisualElement container)
 		{
-			var soundAssetProp = serializedObject.FindProperty("_soundAsset");
+			var soundAssetProp = serializedObject.FindProperty(nameof(SoundComponent.SoundAsset));
 			var calloutFields = container.Q<VisualElement>("callout-fields");
 			var musicFields = container.Q<VisualElement>("music-fields");
 			var effectFields = container.Q<VisualElement>("sound-effect-fields");
@@ -130,7 +130,7 @@ private bool AllTargetsSupportLoopingSoundAssets()
 
 		protected void InfiniteLoopHelpBox(VisualElement container)
 		{
-			var soundAssetProp = serializedObject.FindProperty("_soundAsset");
+			var soundAssetProp = serializedObject.FindProperty(nameof(SoundAsset));
 			var helpBox = new HelpBox(
 				"The assigned sound asset loops, but this component "
 					+ "provides no mechanism to stop it or is not configured to do so. Either assign"
@@ -146,7 +146,7 @@ void UpdateVisbility(SerializedObject obj)
 			{
 				var prop = obj.FindProperty(nameof(SoundComponent.SoundAsset));
 				var soundAsset = prop.objectReferenceValue as SoundAsset;
-				if (soundAsset && soundAsset.Loop && !AllTargetsSupportLoopingSoundAssets()) {
+				if (soundAsset && soundAsset.Loop && !AllTargetsSupportLoopingSoundAssets())
 					helpBox.style.display = DisplayStyle.Flex;
 				else
 					helpBox.style.display = DisplayStyle.None;
@@ -186,4 +186,6 @@ void UpdateDropdown(SerializedProperty property)
 			}
 		}
 	}
+		
+		
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
index 2a05d524e..ccd5fa193 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.uxml
@@ -1,15 +1,15 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:PropertyField name="sound-asset" binding-path="_soundAsset" label="Sound Asset" />
+    <uie:PropertyField name="sound-asset" binding-path="SoundAsset" label="Sound Asset" />
     <uie:PropertyField name="volume" binding-path="_volume" label="Volume" />
     <ui:VisualElement name="callout-fields" style="flex-grow: 1;">
-        <uie:PropertyField name="priority" binding-path="_priority" label="Priority" />
-        <uie:PropertyField name="max-queue-time" binding-path="_maxQueueTime" label="Max Queue Time" tooltip="How many seconds to wait in the queue before discarding the request. -1 = no limit" />
-        <uie:PropertyField name="multi-play-mode" binding-path="_multiPlayMode" label="Multi Play Mode" tooltip="What to do when the callout is still playing or in the queue when it is triggered again. Play In Parallel: Keep the previous callout in the queue and enqueue it again, Do Not Play: Keep the previous callout request and don't enqueue a new one, Fade Out Previous: Since you have selected a callout asset, this is the same as 'Stop Previous', Stop Previous: Immediately stop the previous callout and start a new one. This means the callout goes to the back of the queue. It might not be played immediately." />
+        <uie:PropertyField name="priority" binding-path="Priority" label="Priority" />
+        <uie:PropertyField name="max-queue-time" binding-path="MaxQueueTime" label="Max Queue Time" tooltip="How many seconds to wait in the queue before discarding the request. -1 = no limit" />
+        <uie:PropertyField name="multi-play-mode" binding-path="MultiPlayMode" label="Multi Play Mode" tooltip="What to do when the callout is still playing or in the queue when it is triggered again. Play In Parallel: Keep the previous callout in the queue and enqueue it again, Do Not Play: Keep the previous callout request and don't enqueue a new one, Fade Out Previous: Since you have selected a callout asset, this is the same as 'Stop Previous', Stop Previous: Immediately stop the previous callout and start a new one. This means the callout goes to the back of the queue. It might not be played immediately." />
     </ui:VisualElement>
     <ui:VisualElement name="music-fields" style="flex-grow: 1;">
-        <uie:PropertyField name="priority" binding-path="_priority" label="Priority" />
+        <uie:PropertyField name="priority" binding-path="Priority" label="Priority" />
     </ui:VisualElement>
     <ui:VisualElement name="sound-effect-fields" style="flex-grow: 1;">
-        <uie:PropertyField name="multi-play-mode" binding-path="_multiPlayMode" label="Multi Play Mode" tooltip="What to do when the sound effect is still playing when it is triggered again. Play In Parallel: Keep playing the previous sound effect and start another one at the same time, Do Not Play: Keep playing the previous sound effect and don't start another one, Fade Out Previous: Fade out the previous sound effect while starting a new one. If the sound effect is not a looping sound or its fade out time is zero, this is the same as 'Stop Previous,' Stop Previous: Immediately stop the previous sound effect and start a new one." />
+        <uie:PropertyField name="multi-play-mode" binding-path="MultiPlayMode" label="Multi Play Mode" tooltip="What to do when the sound effect is still playing when it is triggered again. Play In Parallel: Keep playing the previous sound effect and start another one at the same time, Do Not Play: Keep playing the previous sound effect and don't start another one, Fade Out Previous: Fade out the previous sound effect while starting a new one. If the sound effect is not a looping sound or its fade out time is zero, this is the same as 'Stop Previous,' Stop Previous: Immediately stop the previous sound effect and start a new one." />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
index 13d3f951c..1e663e1a8 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/BinaryEventSoundComponent.cs
@@ -27,10 +27,7 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public abstract class BinaryEventSoundComponent<TEventSource, TEventArgs> : EventSoundComponent<TEventSource, TEventArgs> where TEventSource : class
 	{
-		[FormerlySerializedAs("_startWhen")]
 		public StartWhen StartWhen = StartWhen.TurnedOn;
-
-		[FormerlySerializedAs("_stopWhen")]
 		public StopWhen StopWhen = StopWhen.Never;
 
 		protected override void OnEvent(object sender, TEventArgs e)
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index ee6ff33fd..a14bb0416 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -21,6 +21,7 @@
 using System.Threading.Tasks;
 using NLog;
 using UnityEngine;
+using UnityEngine.Serialization;
 using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
@@ -37,13 +38,13 @@ public enum CalloutRequestStatus
 	/// Manages playback of callouts. Maintains a queue of callout requests. Supports prioritizing
 	/// certain callouts over others and enforcing a minimum pause between two callouts.
 	/// </summary>
+	[PackAs("CalloutCoordinator")]
 	public class CalloutCoordinator : MonoBehaviour
 	{
-		[SerializeField]
 		[Range(0f, 3f)]
 		[Tooltip("How many seconds to pause after a callout before the next one can be started")]
-		private float _pauseDuration = 0.5f;
-
+		public float PauseDuration = 0.5f;
+		
 		private readonly List<CalloutRequest> _calloutQ = new();
 		private CancellationTokenSource _loopCts;
 		private CancellationTokenSource _currentCalloutCts;
@@ -162,7 +163,7 @@ private async Task CalloutLoop(CancellationToken ct)
 					_currentCalloutCts.Dispose();
 				}
 
-				await Task.Delay(TimeSpan.FromSeconds(_pauseDuration), ct);
+				await Task.Delay(TimeSpan.FromSeconds(PauseDuration), ct);
 			}
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
index 11eaddb8d..c7c66eb06 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
@@ -29,7 +29,6 @@ namespace VisualPinball.Unity
 	[AddComponentMenu("Pinball/Sound/Coil Sound")]
 	public class CoilSoundComponent : BinaryEventSoundComponent<IApiCoil, NoIdCoilEventArgs>, IPackable
 	{
-		[FormerlySerializedAs("_coilName")]
 		[HideInInspector]
 		public string CoilName;
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index e25d9b78d..e3527c3b6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -19,6 +19,7 @@
 using System.Linq;
 using NLog;
 using UnityEngine;
+using UnityEngine.Serialization;
 using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
@@ -36,12 +37,12 @@ public enum MusicRequestStatus
 	/// The stack is sorted based on priority and age of the requests. The topmost request is
 	/// played. Music fades out when stopped. New music fades in if other music is playing.
 	/// </summary>
+	[PackAs("MusicCoordinator")]
 	public class MusicCoordinator : MonoBehaviour
 	{
 		[Tooltip("How many seconds should transitions between songs take?")]
-		[SerializeField]
 		[Range(0f, 10f)]
-		private float _fadeDuration = 3f;
+		public float FadeDuration = 3f;
 
 		private readonly List<MusicPlayer> _players = new();
 		private readonly List<MusicRequest> _requestStack = new();
@@ -108,7 +109,7 @@ private void EvaluateRequestStack()
 					playerToPlay = musicGo.AddComponent<MusicPlayer>();
 					playerToPlay.Init(
 						musicToPlay,
-						_fadeDuration,
+						FadeDuration,
 						MusicPlayer.AfterStopAction.DeleteGameObject
 					);
 					_players.Add(playerToPlay);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index 500e3d614..ff7e34941 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -15,10 +15,12 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.Audio;
-using UnityEngine.Serialization;
 using Random = UnityEngine.Random;
 
 namespace VisualPinball.Unity
@@ -46,16 +48,15 @@ public enum SelectionMethod
 			RoundRobin,
 			Random,
 		}
-
-		[FormerlySerializedAs("_description")]
-		public string Description;
+		
+		[SerializeField]
+		private string _description;
 
 		[JsonIgnore]
-		[FormerlySerializedAs("_clips")]
 		public AudioClip[] Clips;
 
-		[FormerlySerializedAs("_clipSelectionMethod")]
-		public SelectionMethod ClipSelectionMethod;
+		[SerializeField]
+		private SelectionMethod _clipSelectionMethod;
 
 		[SerializeField]
 		private AudioMixerGroup _audioMixerGroup;
@@ -74,11 +75,11 @@ public virtual void ConfigureAudioSource(AudioSource audioSource)
 
 		public bool IsValid()
 		{
-			if (Clips == null) {
+			if (Clips == null)
 				return false;
 
 			foreach (var clip in Clips) {
-				if (clip != null) {
+				if (clip != null)
 					return true;
 			}
 
@@ -91,7 +92,7 @@ private AudioClip GetClip()
 				throw new InvalidOperationException($"The sound asset '{name}' has no audio clips to play.");
 			}
 
-			switch (ClipSelectionMethod) {
+			switch (_clipSelectionMethod) {
 
 				case SelectionMethod.RoundRobin:
 					_roundRobinIndex %= Clips.Length;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
index be18d5c6b..d687a3ef6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponent.cs
@@ -19,14 +19,19 @@
 using System.Linq;
 using NLog;
 using UnityEngine;
-using Logger = NLog.Logger;
-using System.Threading;
-using System.Threading.Tasks;
-using UnityEngine;
 using UnityEngine.Serialization;
+using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
 {
+	public enum MultiPlayMode
+	{
+		PlayInParallel,
+		DoNotPlay,
+		FadeOutPrevious,
+		StopPrevious,
+	}
+
 	/// <summary>
 	/// Base component for playing a <c>SoundAsset</c> using the public methods <c>Play</c> and <c>Stop</c>.
 	/// </summary>
@@ -34,35 +39,15 @@ namespace VisualPinball.Unity
 	[AddComponentMenu("Pinball/Sound/Sound")]
 	public class SoundComponent : EnableAfterAwakeComponent, IPackable
 	{
-		private enum MultiPlayMode
-		{
-			PlayInParallel,
-			DoNotPlay,
-			FadeOutPrevious,
-			StopPrevious,
-		}
-
-		[SerializeReference]
-		protected SoundAsset _soundAsset;
-		[FormerlySerializedAs("_soundAsset")]
 		public SoundAsset SoundAsset;
-
-		[SerializeField]
-		private MultiPlayMode _multiPlayMode;
-
-		[FormerlySerializedAs("_volume")]
-		[SerializeField, Range(0f, 1f)]
-		public float Volume = 1f;
-
-		[SerializeField]
-		private SoundPriority _priority = SoundPriority.Medium;
-
-		[SerializeField]
-		private float _maxQueueTime = -1;
+		public MultiPlayMode MultiPlayMode;
+		[Range(0f, 1f)] public float Volume = 1f;
+		public SoundPriority Priority = SoundPriority.Medium;
+		public float CalloutMaxQueueTime = -1;
 
 		private CalloutCoordinator _calloutCoordinator;
 		private MusicCoordinator _musicCoordinator;
-		private readonly List<ISoundCommponentSoundPlayer> _soundPlayers = new();
+		private readonly List<ISoundComponentSoundPlayer> _soundPlayers = new();
 
 		protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -80,8 +65,12 @@ public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles fi
 
 		public void Unpack(byte[] bytes) => SoundPackable.Unpack(bytes, this);
 
-		public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files)
-			=> SoundReferencesPackable.Unpack(data, this, files);
+		public void UnpackReferences(
+			byte[] data,
+			Transform root,
+			PackagedRefs refs,
+			PackagedFiles files
+		) => SoundReferencesPackable.Unpack(data, this, files);
 
 		#endregion
 
@@ -126,21 +115,23 @@ protected void StartSound()
 				Logger.Warn("Cannot play a disabled sound component.");
 				return;
 			}
-			if (SoundAsset == null) {
+
+			if (SoundAsset == null)
+			{
 				Logger.Warn("Cannot play without sound asset. Assign it in the inspector.");
 				return;
 			}
 
 			if (IsPlayingOrRequestingSound())
 			{
-				if (_soundAsset is MusicAsset)
+				if (SoundAsset is MusicAsset)
 				{
 					// We never want to have multiple active music requests. Makes no sense.
 					StopAllSounds(allowFade: true);
 				}
 				else
 				{
-					switch (_multiPlayMode)
+					switch (MultiPlayMode)
 					{
 						case MultiPlayMode.PlayInParallel:
 							// Don't need to do anything.
@@ -158,7 +149,7 @@ protected void StartSound()
 			}
 
 			var player = CreateSoundPlayer();
-			player.StartSound(_volume);
+			player.StartSound(Volume);
 			_soundPlayers.Add(player);
 		}
 
@@ -167,35 +158,35 @@ protected void StopAllSounds(bool allowFade)
 			_soundPlayers.ForEach(x => x.StopSound(allowFade));
 		}
 
-		private ISoundCommponentSoundPlayer CreateSoundPlayer()
+		private ISoundComponentSoundPlayer CreateSoundPlayer()
 		{
-			if (_soundAsset is SoundEffectAsset)
+			if (SoundAsset is SoundEffectAsset)
 			{
 				return new SoundComponentSoundEffectPlayer(
-					(SoundEffectAsset)_soundAsset,
+					(SoundEffectAsset)SoundAsset,
 					gameObject
 				);
 			}
 
-			if (_soundAsset is CalloutAsset)
+			if (SoundAsset is CalloutAsset)
 			{
 				var request = new CalloutRequest(
-					(CalloutAsset)_soundAsset,
-					_priority,
-					_maxQueueTime,
-					_volume
+					(CalloutAsset)SoundAsset,
+					Priority,
+					CalloutMaxQueueTime,
+					Volume
 				);
 				return new SoundComponentCalloutPlayer(request, _calloutCoordinator);
 			}
 
-			if (_soundAsset is MusicAsset)
+			if (SoundAsset is MusicAsset)
 			{
-				var request = new MusicRequest((MusicAsset)_soundAsset, _priority, _volume);
+				var request = new MusicRequest((MusicAsset)SoundAsset, Priority, Volume);
 				return new SoundComponentMusicPlayer(request, _musicCoordinator);
 			}
 
 			throw new NotImplementedException(
-				$"Unknown type of sound asset '{_soundAsset.GetType()}'"
+				$"Unknown type of sound asset '{SoundAsset.GetType()}'"
 			);
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
index f135bacac..0f6e143d0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundComponentSoundPlayer.cs
@@ -25,7 +25,7 @@ namespace VisualPinball.Unity
 	/// Single use object to manage the playback of a music, callout, or sound effect asset in the
 	/// context of a <c>SoundComponent</c>
 	/// </summary>
-	public interface ISoundCommponentSoundPlayer : IDisposable
+	public interface ISoundComponentSoundPlayer : IDisposable
 	{
 		public void StartSound(float volume = 10f);
 		public void StopSound(bool allowFade);
@@ -36,7 +36,7 @@ public interface ISoundCommponentSoundPlayer : IDisposable
 	/// Single use object to manage the playback of a sound effect asset in the context of a
 	/// <c>SoundComponent</c>
 	/// </summary>
-	public class SoundComponentSoundEffectPlayer : ISoundCommponentSoundPlayer
+	public class SoundComponentSoundEffectPlayer : ISoundComponentSoundPlayer
 	{
 		private SoundEffectAsset _soundEffectAsset;
 		private GameObject _audioSourceGo;
@@ -93,7 +93,7 @@ public void Dispose()
 	/// Single use object to manage the playback of a music asset in the context of a
 	/// <c>SoundComponent</c>
 	/// </summary>
-	public class SoundComponentMusicPlayer : ISoundCommponentSoundPlayer
+	public class SoundComponentMusicPlayer : ISoundComponentSoundPlayer
 	{
 		private MusicRequest _request;
 		private MusicCoordinator _coordinator;
@@ -131,7 +131,7 @@ public void Dispose() { }
 	/// Single use object to manage the playback of a callout asset in the context of a
 	/// <c>SoundComponent</c>
 	/// </summary>
-	public class SoundComponentCalloutPlayer : ISoundCommponentSoundPlayer
+	public class SoundComponentCalloutPlayer : ISoundComponentSoundPlayer
 	{
 		private CalloutRequest _request;
 		private CalloutCoordinator _coordinator;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
index 3df836b1a..38474cb3c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
@@ -21,21 +21,27 @@
 
 namespace VisualPinball.Unity
 {
-	public class SoundPackable {
-
-		public bool Interrupt;
+	public class SoundPackable
+	{
+		public MultiPlayMode MultiPlayMode;
 		public float Volume;
+		public SoundPriority Priority;
+		public float CalloutMaxQueueTime;
 
 		public static byte[] Pack(SoundComponent comp) => PackageApi.Packer.Pack(new SoundPackable {
-			Interrupt = comp.Interrupt,
+			MultiPlayMode = comp.MultiPlayMode,
 			Volume = comp.Volume,
+			Priority = comp.Priority,
+			CalloutMaxQueueTime = comp.CalloutMaxQueueTime,
 		});
 
 		public static void Unpack(byte[] bytes, SoundComponent comp)
 		{
 			var data = PackageApi.Packer.Unpack<SoundPackable>(bytes);
-			comp.Interrupt = data.Interrupt;
+			comp.MultiPlayMode = data.MultiPlayMode;
 			comp.Volume = data.Volume;
+			comp.Priority = data.Priority;
+			comp.CalloutMaxQueueTime = data.CalloutMaxQueueTime;
 		}
 	}
 
@@ -51,8 +57,10 @@ public class SwitchSoundPackable : BinaryEventSoundPackable
 
 		public static byte[] Pack(SwitchSoundComponent comp)
 			=> PackageApi.Packer.Pack(new SwitchSoundPackable {
-				Interrupt = comp.Interrupt,
+				MultiPlayMode = comp.MultiPlayMode,
 				Volume = comp.Volume,
+				Priority = comp.Priority,
+				CalloutMaxQueueTime = comp.CalloutMaxQueueTime,
 				StartWhen = comp.StartWhen,
 				StopWhen = comp.StopWhen,
 				SwitchName = comp.SwitchName
@@ -61,8 +69,10 @@ public static byte[] Pack(SwitchSoundComponent comp)
 		public static void Unpack(byte[] bytes, SwitchSoundComponent comp)
 		{
 			var data = PackageApi.Packer.Unpack<SwitchSoundPackable>(bytes);
-			comp.Interrupt = data.Interrupt;
+			comp.MultiPlayMode = data.MultiPlayMode;
 			comp.Volume = data.Volume;
+			comp.Priority = data.Priority;
+			comp.CalloutMaxQueueTime = data.CalloutMaxQueueTime;
 			comp.StartWhen = data.StartWhen;
 			comp.StopWhen = data.StopWhen;
 			comp.SwitchName = data.SwitchName;
@@ -75,8 +85,10 @@ public class CoilSoundPackable : BinaryEventSoundPackable
 
 		public static byte[] Pack(CoilSoundComponent comp)
 			=> PackageApi.Packer.Pack(new CoilSoundPackable {
-				Interrupt = comp.Interrupt,
+				MultiPlayMode = comp.MultiPlayMode,
 				Volume = comp.Volume,
+				Priority = comp.Priority,
+				CalloutMaxQueueTime = comp.CalloutMaxQueueTime,
 				StartWhen = comp.StartWhen,
 				StopWhen = comp.StopWhen,
 				CoilName = comp.CoilName
@@ -85,8 +97,10 @@ public static byte[] Pack(CoilSoundComponent comp)
 		public static void Unpack(byte[] bytes, CoilSoundComponent comp)
 		{
 			var data = PackageApi.Packer.Unpack<CoilSoundPackable>(bytes);
-			comp.Interrupt = data.Interrupt;
+			comp.MultiPlayMode = data.MultiPlayMode;
 			comp.Volume = data.Volume;
+			comp.Priority = data.Priority;
+			comp.CalloutMaxQueueTime = data.CalloutMaxQueueTime;
 			comp.StartWhen = data.StartWhen;
 			comp.StopWhen = data.StopWhen;
 			comp.CoilName = data.CoilName;
@@ -131,4 +145,36 @@ public struct SoundMetaPackable
 		public string Guid;
 		// will probably get more data in here
 	}
+
+	public class CalloutCoordinatorPackable
+	{
+		public float PauseDuration;
+
+		public static byte[] Pack(CalloutCoordinator comp)
+			=> PackageApi.Packer.Pack(new CalloutCoordinatorPackable {
+				PauseDuration = comp.PauseDuration
+			});
+		
+		public static void Unpack(byte[] bytes, CalloutCoordinator comp)
+		{
+			var data = PackageApi.Packer.Unpack<CalloutCoordinatorPackable>(bytes);
+			comp.PauseDuration = data.PauseDuration;
+		}
+	}
+	
+	public class MusicCoordinatorPackable
+	{
+		public float FadeDuration;
+
+		public static byte[] Pack(MusicCoordinator comp)
+			=> PackageApi.Packer.Pack(new MusicCoordinatorPackable {
+				FadeDuration = comp.FadeDuration
+			});
+		
+		public static void Unpack(byte[] bytes, MusicCoordinator comp)
+		{
+			var data = PackageApi.Packer.Unpack<MusicCoordinatorPackable>(bytes);
+			comp.FadeDuration = data.FadeDuration;
+		}
+	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
index 5dcffab46..74242d951 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
@@ -29,7 +29,6 @@ namespace VisualPinball.Unity
 	[AddComponentMenu("Pinball/Sound/Switch Sound")]
 	public class SwitchSoundComponent : BinaryEventSoundComponent<IApiSwitch, SwitchEventArgs>, IPackable
 	{
-		[FormerlySerializedAs("_switchName")]
 		[HideInInspector]
 		public string SwitchName;
 

From 6cffd1bc6041b92c7cfdbdee1330079dfa5a28d3 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Sun, 9 Mar 2025 13:35:53 +0100
Subject: [PATCH 49/53] sounds: Rename some inspectors for consistency.

---
 .../AssetBrowser/AssetLibrary.cs                          | 2 +-
 ...ComponentInspector.cs => BinaryEventSoundInspector.cs} | 2 +-
 ...nspector.cs.meta => BinaryEventSoundInspector.cs.meta} | 0
 ...onentInspector.uxml => BinaryEventSoundInspector.uxml} | 0
 ...ctor.uxml.meta => BinaryEventSoundInspector.uxml.meta} | 0
 .../Sound/CalloutAssetInspector.cs                        | 4 +++-
 ...ilSoundComponentInspector.cs => CoilSoundInspector.cs} | 2 +-
 ...ponentInspector.cs.meta => CoilSoundInspector.cs.meta} | 0
 ...undComponentInspector.uxml => CoilSoundInspector.uxml} | 0
 ...ntInspector.uxml.meta => CoilSoundInspector.uxml.meta} | 0
 ...SoundComponentInspector.cs => SwitchSoundInspector.cs} | 8 +++-----
 ...nentInspector.cs.meta => SwitchSoundInspector.cs.meta} | 0
 ...dComponentInspector.uxml => SwitchSoundInspector.uxml} | 0
 ...Inspector.uxml.meta => SwitchSoundInspector.uxml.meta} | 0
 14 files changed, 9 insertions(+), 9 deletions(-)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{BinaryEventSoundComponentInspector.cs => BinaryEventSoundInspector.cs} (93%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{BinaryEventSoundComponentInspector.cs.meta => BinaryEventSoundInspector.cs.meta} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{BinaryEventSoundComponentInspector.uxml => BinaryEventSoundInspector.uxml} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{BinaryEventSoundComponentInspector.uxml.meta => BinaryEventSoundInspector.uxml.meta} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{CoilSoundComponentInspector.cs => CoilSoundInspector.cs} (96%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{CoilSoundComponentInspector.cs.meta => CoilSoundInspector.cs.meta} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{CoilSoundComponentInspector.uxml => CoilSoundInspector.uxml} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{CoilSoundComponentInspector.uxml.meta => CoilSoundInspector.uxml.meta} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{SwitchSoundComponentInspector.cs => SwitchSoundInspector.cs} (89%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{SwitchSoundComponentInspector.cs.meta => SwitchSoundInspector.cs.meta} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{SwitchSoundComponentInspector.uxml => SwitchSoundInspector.uxml} (100%)
 rename VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/{SwitchSoundComponentInspector.uxml.meta => SwitchSoundInspector.uxml.meta} (100%)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs
index e6b1f2380..c5f3362c9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs
@@ -30,7 +30,7 @@ namespace VisualPinball.Unity.Editor
 	/// This is the root node of the asset library.
 	///
 	/// The data itself is stored in a sub object, <see cref="_db"/>. This sub object contains
-	/// references to the asset meta data, as well as the categories.
+	/// references to the asset metadata, as well as the categories.
 	/// </summary>
 	[CreateAssetMenu(fileName = "Library", menuName = "Pinball/Asset Library", order = 300)]
 	public class AssetLibrary : ScriptableObject, ISerializationCallbackReceiver
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.cs
similarity index 93%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.cs
index 38301121f..b74a2048a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.cs
@@ -21,7 +21,7 @@
 namespace VisualPinball.Unity.Editor
 {
 	[CanEditMultipleObjects]
-	public class BinaryEventSoundComponentInspector : SoundComponentInspector
+	public class BinaryEventSoundInspector : SoundComponentInspector
 	{
 		[SerializeField]
 		private VisualTreeAsset binaryEventSoundInspectorXml;
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.uxml
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.uxml
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.uxml.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundComponentInspector.uxml.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/BinaryEventSoundInspector.uxml.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs
index aaba5f2e2..e422c0b78 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CalloutAssetInspector.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -21,7 +23,7 @@
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(CalloutAsset)), CanEditMultipleObjects]
-	public class VoiceAssetInspector : SoundAssetInspector
+	public class CalloutAssetInspector : SoundAssetInspector
 	{
 		[SerializeField]
 		private VisualTreeAsset _calloutAssetInspector;
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.cs
similarity index 96%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.cs
index 30e8ba647..92dd8455d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.cs
@@ -23,7 +23,7 @@
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(CoilSoundComponent)), CanEditMultipleObjects]
-	public class CoilSoundComponentInspector : BinaryEventSoundComponentInspector
+	public class CoilSoundInspector : BinaryEventSoundInspector
 	{
 		[SerializeField]
 		private VisualTreeAsset coilSoundInspectorXml;
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.uxml
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.uxml
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.uxml
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.uxml.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundComponentInspector.uxml.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/CoilSoundInspector.uxml.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.cs
similarity index 89%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.cs
index db5afc8e7..0a514db70 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.cs
@@ -23,7 +23,7 @@
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(SwitchSoundComponent)), CanEditMultipleObjects]
-	public class SwitchSoundComponentInspector : BinaryEventSoundComponentInspector
+	public class SwitchSoundInspector : BinaryEventSoundInspector
 	{
 		[SerializeField]
 		private VisualTreeAsset switchSoundInspectorXml;
@@ -44,10 +44,8 @@ private Dictionary<string, string> GetAvailableSwitches()
 		{
 			if (
 				target != null
-				&& target is Component
-				&& (target as Component).TryGetComponent<ISwitchDeviceComponent>(
-					out var switchDevice
-				)
+				&& target is Component t
+				&& t.TryGetComponent<ISwitchDeviceComponent>(out var switchDevice)
 			)
 			{
 				return switchDevice.AvailableSwitches.ToDictionary(
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.uxml
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.uxml
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.uxml
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.uxml.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundComponentInspector.uxml.meta
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SwitchSoundInspector.uxml.meta

From eaacaa59e1df901f27cf6c2ef9f74063adeac925 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Sun, 9 Mar 2025 13:37:45 +0100
Subject: [PATCH 50/53] style: Imports, comments, var names.

---
 .../Sound/SoundAssetInspector.cs                    |  3 ++-
 .../Sound/SoundComponentInspector.cs                | 13 +++++--------
 .../Sound/SoundEffectAssetInspector.cs              |  2 ++
 .../VisualPinball.Unity/Packaging/IPackable.cs      |  7 +++++++
 .../VisualPinball.Unity/Packaging/PackageApi.cs     |  2 +-
 .../VisualPinball.Unity/Sound/CalloutCoordinator.cs |  3 ++-
 .../VisualPinball.Unity/Sound/MusicCoordinator.cs   |  2 --
 .../VisualPinball.Unity/Sound/MusicRequester.cs     |  2 ++
 .../VisualPinball.Unity/Sound/SoundEffectAsset.cs   |  2 ++
 9 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
index 93a821d9b..7292ac1a6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundAssetInspector.cs
@@ -14,8 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using UnityEditor;
-using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
index b2a87b48a..cde99da5c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundComponentInspector.cs
@@ -99,9 +99,8 @@ void UpdateVisibility(SerializedProperty prop)
 
 		protected void MissingComponentHelpBox(VisualElement container)
 		{
-			if (target != null && target is SoundComponent)
+			if (target != null && target is SoundComponent soundComp)
 			{
-				var soundComp = target as SoundComponent;
 				var requiredType = soundComp.GetRequiredType();
 				if (requiredType != null && !soundComp.TryGetComponent(requiredType, out var _))
 					container.Add(
@@ -116,13 +115,13 @@ protected void MissingComponentHelpBox(VisualElement container)
 
 		private bool AllTargetsSupportLoopingSoundAssets()
 		{
-			foreach (var target in targets)
+			foreach (var t in targets)
 			{
-				if (target == null)
+				if (t == null)
 					continue;
-				if (target is not SoundComponent)
+				if (t is not SoundComponent)
 					continue;
-				if (!(target as SoundComponent).SupportsLoopingSoundAssets())
+				if (!(t as SoundComponent).SupportsLoopingSoundAssets())
 					return false;
 			}
 			return true;
@@ -186,6 +185,4 @@ void UpdateDropdown(SerializedProperty property)
 			}
 		}
 	}
-		
-		
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
index fe5e28506..8fc25450c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Sound/SoundEffectAssetInspector.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using System;
 using System.Threading;
 using UnityEditor;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Packaging/IPackable.cs b/VisualPinball.Unity/VisualPinball.Unity/Packaging/IPackable.cs
index ca5c28c4d..875eb055f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Packaging/IPackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Packaging/IPackable.cs
@@ -23,6 +23,13 @@ namespace VisualPinball.Unity
 	/// </summary>
 	public interface IPackable
 	{
+		/// <summary>
+		/// Packs the component data into a byte array.
+		///
+		/// Returning null will not even create the component for the game object. For components
+		/// with no data, return <see cref="PackageApi.Packer.Empty"/> instead.
+		/// </summary>
+		/// <returns>Component data in binary</returns>
 		byte[] Pack();
 		byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files);
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackageApi.cs b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackageApi.cs
index 676b02707..52d128ffb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackageApi.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackageApi.cs
@@ -207,7 +207,7 @@ public interface IDataPacker
 		public byte[] Pack<T>(T obj);
 
 		/// <summary>
-		///
+		/// An empty object. Just means that the component is written, but no other data is stored.
 		/// </summary>
 		/// <returns></returns>
 		public byte[] Empty { get; }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index a14bb0416..ada82e566 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,7 +23,6 @@
 using System.Threading.Tasks;
 using NLog;
 using UnityEngine;
-using UnityEngine.Serialization;
 using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index e3527c3b6..4d20b6bbf 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -14,12 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using UnityEngine;
-using UnityEngine.Serialization;
 using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
index f667f000e..637ab5920 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using UnityEngine;
 
 namespace VisualPinball.Unity
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index 689114074..c0e705656 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;

From 210b179e9aca367bc788624efd753e009d223ec6 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Sun, 9 Mar 2025 13:38:25 +0100
Subject: [PATCH 51/53] sounds: Make 'em all packable.

---
 .../VisualPinball.Unity/Sound/CalloutAsset.cs |  1 +
 .../Sound/CalloutCoordinator.cs               | 20 +++++++-
 .../Sound/CalloutRequester.cs                 | 33 +++++++++----
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |  1 +
 .../Sound/MusicCoordinator.cs                 | 18 ++++++-
 .../Sound/MusicRequester.cs                   | 30 ++++++++----
 .../VisualPinball.Unity/Sound/SoundAsset.cs   |  1 -
 .../Sound/SoundEffectAsset.cs                 |  1 +
 .../Sound/SoundPackable.cs                    | 48 ++++++++++++++++++-
 9 files changed, 130 insertions(+), 23 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index df349e2f3..f22fc63ea 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -23,6 +23,7 @@ namespace VisualPinball.Unity
 		menuName = "Visual Pinball/Sound/CalloutAsset",
 		order = 102
 	)]
+	[PackAs("CalloutAsset")]
 	public class CalloutAsset : SoundAsset
 	{
 		public override bool Loop => false;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
index ada82e566..04d9d925a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutCoordinator.cs
@@ -40,11 +40,27 @@ public enum CalloutRequestStatus
 	/// certain callouts over others and enforcing a minimum pause between two callouts.
 	/// </summary>
 	[PackAs("CalloutCoordinator")]
-	public class CalloutCoordinator : MonoBehaviour
+	public class CalloutCoordinator : MonoBehaviour, IPackable
 	{
+		#region Data
+
 		[Range(0f, 3f)]
 		[Tooltip("How many seconds to pause after a callout before the next one can be started")]
 		public float PauseDuration = 0.5f;
+
+		#endregion
+
+		#region Packaging
+
+		public byte[] Pack() => CalloutCoordinatorPackable.Pack(this);
+
+		public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files) => null;
+
+		public void Unpack(byte[] bytes) => CalloutCoordinatorPackable.Unpack(bytes, this);
+
+		public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files) { }
+
+		#endregion
 		
 		private readonly List<CalloutRequest> _calloutQ = new();
 		private CancellationTokenSource _loopCts;
@@ -54,7 +70,7 @@ public class CalloutCoordinator : MonoBehaviour
 		private int _requestCounter;
 		private int _idOfCurrentlyPlayingRequest = -1;
 
-		private static Logger Logger = LogManager.GetCurrentClassLogger();
+		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
 		public void EnqueueCallout(CalloutRequest request, out int requestId)
 		{
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
index e00283247..37cb6944c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutRequester.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using UnityEngine;
 
 namespace VisualPinball.Unity
@@ -21,24 +23,37 @@ namespace VisualPinball.Unity
 	/// <summary>
 	/// Requests a callout from the callout coordinator when enabled. Intended for testing.
 	/// </summary>
-	public class CalloutRequester : MonoBehaviour
+	[PackAs("CalloutRequester")]
+	public class CalloutRequester : MonoBehaviour, IPackable
 	{
-		[SerializeField]
-		private CalloutAsset _calloutAsset;
+		#region Data
 
-		[SerializeField]
-		private SoundPriority _priority = SoundPriority.Medium;
+		public CalloutAsset CalloutAsset;
+		public SoundPriority Priority = SoundPriority.Medium;
+		public float MaxQueueTime = -1f;
 
-		[SerializeField]
-		private float _maxQueueTime = -1f;
+		#endregion
 
-		private CalloutCoordinator _coordinator;
+		#region Packaging
+
+		public byte[] Pack() => PackageApi.Packer.Empty;
+
+		public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files)
+			=> CalloutRequesterPackable.Pack(this, files);
 
+		public void Unpack(byte[] bytes) { }
+
+		public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files)
+			=> CalloutRequesterPackable.Unpack(data, this, files);
+
+		#endregion
+
+		private CalloutCoordinator _coordinator;
 		private int _requestId;
 
 		private void OnEnable()
 		{
-			var request = new CalloutRequest(_calloutAsset, _priority, _maxQueueTime);
+			var request = new CalloutRequest(CalloutAsset, Priority, MaxQueueTime);
 			_coordinator = GetComponentInParent<CalloutCoordinator>();
 			_coordinator.EnqueueCallout(request, out _requestId);
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index cc58c9bf2..3e62a97bd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -24,6 +24,7 @@ namespace VisualPinball.Unity
 		menuName = "Visual Pinball/Sound/MusicAsset",
 		order = 102
 	)]
+	[PackAs("MusicAsset")]
 	public class MusicAsset : SoundAsset
 	{
 		public float Volume => _volume;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
index 4d20b6bbf..3c274acf2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicCoordinator.cs
@@ -36,12 +36,28 @@ public enum MusicRequestStatus
 	/// played. Music fades out when stopped. New music fades in if other music is playing.
 	/// </summary>
 	[PackAs("MusicCoordinator")]
-	public class MusicCoordinator : MonoBehaviour
+	public class MusicCoordinator : MonoBehaviour, IPackable
 	{
+		#region Data
+
 		[Tooltip("How many seconds should transitions between songs take?")]
 		[Range(0f, 10f)]
 		public float FadeDuration = 3f;
 
+		#endregion
+
+		#region Packaging
+
+		public byte[] Pack() => MusicCoordinatorPackable.Pack(this);
+
+		public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files) => null;
+
+		public void Unpack(byte[] bytes) => MusicCoordinatorPackable.Unpack(bytes, this);
+
+		public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files) { }
+
+		#endregion
+
 		private readonly List<MusicPlayer> _players = new();
 		private readonly List<MusicRequest> _requestStack = new();
 		private int _requestCounter;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
index 637ab5920..a420f46fd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicRequester.cs
@@ -23,16 +23,30 @@ namespace VisualPinball.Unity
 	/// <summary>
 	/// Requests music from the music coordinator while enabled. Intended for testing.
 	/// </summary>
-	public class MusicRequester : MonoBehaviour
+	[PackAs("MusicRequester")]
+	public class MusicRequester : MonoBehaviour, IPackable
 	{
-		[SerializeField]
-		private MusicAsset _musicAsset;
+		#region Data
 
-		[SerializeField]
-		private SoundPriority _priority = SoundPriority.Medium;
+		public MusicAsset MusicAsset;
+		public SoundPriority Priority = SoundPriority.Medium;
+		public float Volume = 1f;
 
-		[SerializeField]
-		private float _volume = 1f;
+		#endregion
+
+		#region Packaging
+
+		public byte[] Pack() => PackageApi.Packer.Empty;
+
+		public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files)
+			=> MusicRequesterPackable.Pack(this, files);
+
+		public void Unpack(byte[] bytes) { }
+
+		public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files)
+			=> MusicRequesterPackable.Unpack(data, this, files);
+
+		#endregion
 
 		private int requestId;
 
@@ -40,7 +54,7 @@ public class MusicRequester : MonoBehaviour
 
 		private void OnEnable()
 		{
-			var request = new MusicRequest(_musicAsset, _priority, _volume);
+			var request = new MusicRequest(MusicAsset, Priority, Volume);
 			_coordinator = GetComponentInParent<MusicCoordinator>();
 			_coordinator.AddRequest(request, out requestId);
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index ff7e34941..bf0cc3013 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -39,7 +39,6 @@ public enum SoundPriority
 	/// clips can be assigned for variation. Instances of this class are Unity assets and can
 	/// therefore be stored in the project files or in an asset library for reuse across tables.
 	/// </summary>
-	[PackAs("SoundAsset")]
 	[CreateAssetMenu(fileName = "Sound", menuName = "Pinball/Sound", order = 102)]
 	public abstract class SoundAsset : ScriptableObject
 	{
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index c0e705656..eb5361e96 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -46,6 +46,7 @@ public enum SoundEffectType
 		menuName = "Visual Pinball/Sound/SoundEffectAsset",
 		order = 102
 	)]
+	[PackAs("SoundEffectAsset")]
 	public class SoundEffectAsset : SoundAsset
 	{
 		public override bool Loop => _loop;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
index 38474cb3c..b4437bb23 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
@@ -146,7 +146,7 @@ public struct SoundMetaPackable
 		// will probably get more data in here
 	}
 
-	public class CalloutCoordinatorPackable
+	public struct CalloutCoordinatorPackable
 	{
 		public float PauseDuration;
 
@@ -161,8 +161,52 @@ public static void Unpack(byte[] bytes, CalloutCoordinator comp)
 			comp.PauseDuration = data.PauseDuration;
 		}
 	}
+
+	public struct CalloutRequesterPackable
+	{
+		public int CalloutAssetRef;
+		public SoundPriority Priority;
+		public float MaxQueueTime;
+
+		public static byte[] Pack(CalloutRequester comp, PackagedFiles files)
+			=> PackageApi.Packer.Pack(new CalloutRequesterPackable {
+				CalloutAssetRef = files.AddAsset(comp.CalloutAsset),
+				Priority = comp.Priority,
+				MaxQueueTime = comp.MaxQueueTime
+			});
+
+		public static void Unpack(byte[] bytes, CalloutRequester comp, PackagedFiles files)
+		{
+			var data = PackageApi.Packer.Unpack<CalloutRequesterPackable>(bytes);
+			comp.CalloutAsset = files.GetAsset<CalloutAsset>(data.CalloutAssetRef);
+			comp.Priority = data.Priority;
+			comp.MaxQueueTime = data.MaxQueueTime;
+		}
+	}
+
+	public struct MusicRequesterPackable
+	{
+		public int MusicAssetRef;
+		public SoundPriority Priority;
+		public float Volume;
+
+		public static byte[] Pack(MusicRequester comp, PackagedFiles files)
+			=> PackageApi.Packer.Pack(new MusicRequesterPackable {
+				MusicAssetRef = files.AddAsset(comp.MusicAsset),
+				Priority = comp.Priority,
+				Volume = comp.Volume
+			});
+
+		public static void Unpack(byte[] bytes, MusicRequester comp, PackagedFiles files)
+		{
+			var data = PackageApi.Packer.Unpack<MusicRequesterPackable>(bytes);
+			comp.MusicAsset = files.GetAsset<MusicAsset>(data.MusicAssetRef);
+			comp.Priority = data.Priority;
+			comp.Volume = data.Volume;
+		}
+	}
 	
-	public class MusicCoordinatorPackable
+	public struct MusicCoordinatorPackable
 	{
 		public float FadeDuration;
 

From 50a59ee227262cc4ad7ec25b7853c676115f5bc5 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Sun, 9 Mar 2025 13:58:56 +0100
Subject: [PATCH 52/53] fix: Menu names.

---
 VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs   | 2 +-
 VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs     | 2 +-
 .../VisualPinball.Unity/Sound/SoundEffectAsset.cs               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index f22fc63ea..c955b594a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -20,7 +20,7 @@ namespace VisualPinball.Unity
 {
 	[CreateAssetMenu(
 		fileName = "CalloutAsset",
-		menuName = "Visual Pinball/Sound/CalloutAsset",
+		menuName = "Pinball/Sound/CalloutAsset",
 		order = 102
 	)]
 	[PackAs("CalloutAsset")]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 3e62a97bd..2843b8a60 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -21,7 +21,7 @@ namespace VisualPinball.Unity
 {
 	[CreateAssetMenu(
 		fileName = "MusicAsset",
-		menuName = "Visual Pinball/Sound/MusicAsset",
+		menuName = "Pinball/Sound/MusicAsset",
 		order = 102
 	)]
 	[PackAs("MusicAsset")]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
index eb5361e96..518fb1c39 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundEffectAsset.cs
@@ -43,7 +43,7 @@ public enum SoundEffectType
 	/// </summary>
 	[CreateAssetMenu(
 		fileName = "SoundEffect",
-		menuName = "Visual Pinball/Sound/SoundEffectAsset",
+		menuName = "Pinball/Sound/SoundEffectAsset",
 		order = 102
 	)]
 	[PackAs("SoundEffectAsset")]

From aeacca0762712e906a14ac6a24d9b65155d3530a Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Sun, 9 Mar 2025 16:12:24 +0100
Subject: [PATCH 53/53] packaging: Move asset file refs into external packer
 class.

---
 .../Packaging/CommonPackables.cs              |  2 +-
 .../Packaging/PackWithAttribute.cs            | 72 +++++++++++++++++++
 .../Packaging/PackWithAttribute.cs.meta       |  3 +
 .../Packaging/PackagedFiles.cs                | 25 +++++--
 .../VisualPinball.Unity/Sound/CalloutAsset.cs |  1 +
 .../VisualPinball.Unity/Sound/MusicAsset.cs   |  1 +
 .../VisualPinball.Unity/Sound/SoundAsset.cs   |  1 +
 .../Sound/SoundAssetPacker.cs                 | 48 +++++++++++++
 .../Sound/SoundAssetPacker.cs.meta            |  3 +
 .../Sound/SoundPackable.cs                    | 14 +---
 10 files changed, 151 insertions(+), 19 deletions(-)
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs.meta
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs
 create mode 100644 VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs.meta

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Packaging/CommonPackables.cs b/VisualPinball.Unity/VisualPinball.Unity/Packaging/CommonPackables.cs
index 207826d09..a0888fd7d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Packaging/CommonPackables.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Packaging/CommonPackables.cs
@@ -96,7 +96,7 @@ public static byte[] Pack(ScriptableObject obj)
 			return PackageApi.Packer.Pack(obj);
 		}
 
-		public static byte[] PackMeta(ScriptableObject obj) => PackageApi.Packer.Pack(new MetaPackable { InstanceId = obj.GetInstanceID() });
+		public static byte[] PackMeta(MetaPackable mp) => PackageApi.Packer.Pack(mp);
 
 		public static MetaPackable UnpackMeta(byte[] data) => PackageApi.Packer.Unpack<MetaPackable>(data);
 	}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs
new file mode 100644
index 000000000..91149b3a3
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs
@@ -0,0 +1,72 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Reflection;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	/// <summary>
+	/// This is used for packing scriptable objects that reference files (and in the future, other scriptable objects).
+	///
+	/// It allows specifying a packer class that is instantiated during packaging and unpacking
+	/// and that handles these references correctly. It's currently not used for anything else, such
+	/// as components. (We already have full control over these, but it might save us from IPackable.
+	/// To be followed up).
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+	public class PackWithAttribute : Attribute
+	{
+		public Type PackerType { get; }
+
+		public PackWithAttribute(Type packerType)
+		{
+			PackerType = packerType;
+		}
+	}
+
+	public interface IPacker<in T>
+	{
+		MetaPackable Pack(int instanceId, T obj, PackagedFiles files);
+		MetaPackable Unpack(byte[] bytes, T obj, PackagedFiles files);
+	}
+
+	public static class PackerFactory
+	{
+		public static IPacker<T> GetPacker<T>() => GetPacker<T>(typeof(T));
+		public static IPacker<ScriptableObject> GetPacker(Type t) => GetPacker<ScriptableObject>(t);
+
+		private static IPacker<T> GetPacker<T>(Type t)
+		{
+			// look for the PackWithAttribute on T
+			var attr = t.GetCustomAttribute<PackWithAttribute>();
+			if (attr == null) {
+				return null;
+			}
+
+			// check whether the PackerType implements IPacker<T>
+			var packerType = attr.PackerType;
+			if (!typeof(IPacker<T>).IsAssignableFrom(packerType)) {
+				throw new InvalidOperationException($"Type {packerType.FullName} does not implement IPacker<{typeof(T).Name}>.");
+			}
+
+			// construct an instance of the PackerType
+			var packer = (IPacker<T>)Activator.CreateInstance(packerType);
+			return packer;
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs.meta
new file mode 100644
index 000000000..51189f31c
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackWithAttribute.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dfdaa23c3d3e4d599987a4e95b62d7f7
+timeCreated: 1741528320
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackagedFiles.cs b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackagedFiles.cs
index a00fd0e59..2b76bacb4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackagedFiles.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Packaging/PackagedFiles.cs
@@ -151,19 +151,29 @@ public Mesh GetColliderMesh(string guid)
 
 		private readonly HashSet<ScriptableObject> _scriptableObjects = new();
 		private readonly Dictionary<int, ScriptableObject> _deserializedAssets = new();
+		private readonly Dictionary<int, MetaPackable> _assetMetas = new();
 
-		public int AddAsset(ScriptableObject scriptableObject)
+		public int AddAsset<T>(T scriptableObject) where T : ScriptableObject
 		{
 			if (scriptableObject == null) {
 				return 0;
 			}
 
+			var instanceId = scriptableObject.GetInstanceID();
 			if (!_typeLookup.HasType(scriptableObject.GetType())) {
 				throw new Exception($"Unsupported asset type {scriptableObject.GetType().FullName}");
 			}
 
-			_scriptableObjects.Add(scriptableObject);
-			return scriptableObject.GetInstanceID();
+			if (!_assetMetas.ContainsKey(instanceId)) {
+				_scriptableObjects.Add(scriptableObject);
+				var packer = PackerFactory.GetPacker<T>();
+				_assetMetas.Add(instanceId, packer != null
+					? packer.Pack(instanceId, scriptableObject, this)
+					: new MetaPackable { InstanceId = scriptableObject.GetInstanceID() }
+				);
+			}
+
+			return instanceId;
 		}
 
 		public T GetAsset<T>(int instanceId) where T : ScriptableObject
@@ -193,7 +203,7 @@ public void PackAssets()
 
 				// pack meta
 				var fileMeta = assetTypeFolder.AddFile($"{name}.meta", PackageApi.Packer.FileExtension);
-				fileMeta.SetData(MetaPackable.PackMeta(so));
+				fileMeta.SetData(MetaPackable.PackMeta(_assetMetas[so.GetInstanceID()]));
 			}
 		}
 
@@ -213,7 +223,7 @@ public void UnpackAssets(string assetPath)
 					if (!assetTypeFolder.TryGetFile(metaFilename, out var metaFile)) {
 						throw new Exception($"Cannot find meta file {metaFilename} for {assetFile.Name}");
 					}
-					var meta = MetaPackable.UnpackMeta(metaFile.GetData());
+
 					var type = _typeLookup.GetType(assetTypeFolder.Name);
 					if (type == null) {
 						throw new Exception($"Unknown asset type {assetTypeFolder.Name}");
@@ -224,6 +234,11 @@ public void UnpackAssets(string assetPath)
 						throw new Exception($"Failed to unpack asset {assetFile.Name}");
 					}
 
+					var packer = PackerFactory.GetPacker(type);
+					var meta = packer == null
+						? MetaPackable.UnpackMeta(metaFile.GetData())
+						: packer.Unpack(metaFile.GetData(), asset, this);
+
 					var folder = Path.Combine(assetPath, assetTypeFolder.Name);
 					if (!Directory.Exists(folder)) {
 						Directory.CreateDirectory(folder);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
index c955b594a..26b3da0dc 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/CalloutAsset.cs
@@ -24,6 +24,7 @@ namespace VisualPinball.Unity
 		order = 102
 	)]
 	[PackAs("CalloutAsset")]
+	[PackWith(typeof(SoundAssetPacker))]
 	public class CalloutAsset : SoundAsset
 	{
 		public override bool Loop => false;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
index 2843b8a60..e4ad0020c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/MusicAsset.cs
@@ -25,6 +25,7 @@ namespace VisualPinball.Unity
 		order = 102
 	)]
 	[PackAs("MusicAsset")]
+	[PackWith(typeof(SoundAssetPacker))]
 	public class MusicAsset : SoundAsset
 	{
 		public float Volume => _volume;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
index bf0cc3013..ebdd00942 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAsset.cs
@@ -40,6 +40,7 @@ public enum SoundPriority
 	/// therefore be stored in the project files or in an asset library for reuse across tables.
 	/// </summary>
 	[CreateAssetMenu(fileName = "Sound", menuName = "Pinball/Sound", order = 102)]
+	[PackWith(typeof(SoundAssetPacker))]
 	public abstract class SoundAsset : ScriptableObject
 	{
 		public enum SelectionMethod
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs
new file mode 100644
index 000000000..17b1b6816
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs
@@ -0,0 +1,48 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Linq;
+
+namespace VisualPinball.Unity
+{
+	public class SoundAssetPacker : IPacker<SoundAsset>
+	{
+		public MetaPackable Pack(int instanceId, SoundAsset soundAsset, PackagedFiles files)
+		{
+			var clipRefs = soundAsset.Clips != null
+				? soundAsset.Clips.Select(files.Add).ToArray()
+				: Array.Empty<string>();
+
+			return new SoundAssetMetaPackable {
+				ClipRefs = clipRefs,
+				InstanceId = instanceId
+			};
+		}
+
+		public MetaPackable Unpack(byte[] bytes, SoundAsset soundAsset, PackagedFiles files)
+		{
+			var data = PackageApi.Packer.Unpack<SoundAssetMetaPackable>(bytes);
+			soundAsset.Clips = data.ClipRefs.Select(files.GetAudioClip).ToArray();
+			return data;
+		}
+	}
+
+	public class SoundAssetMetaPackable : MetaPackable
+	{
+		public string[] ClipRefs;
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs.meta
new file mode 100644
index 000000000..0d3f7b93f
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundAssetPacker.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 69ab2b1b679f486fa819f5b2734cc29f
+timeCreated: 1741528397
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
index b4437bb23..fcef6e35f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Sound/SoundPackable.cs
@@ -17,7 +17,6 @@
 // ReSharper disable MemberCanBePrivate.Global
 
 using System;
-using System.Linq;
 
 namespace VisualPinball.Unity
 {
@@ -110,7 +109,6 @@ public static void Unpack(byte[] bytes, CoilSoundComponent comp)
 	public struct SoundReferencesPackable {
 
 		public int SoundAssetRef;
-		public string[]	ClipRefs;
 
 		public static byte[] PackReferences(SoundComponent comp, PackagedFiles files)
 		{
@@ -118,17 +116,8 @@ public static byte[] PackReferences(SoundComponent comp, PackagedFiles files)
 				return Array.Empty<byte>();
 			}
 
-			// pack asset
-			var assetRef = files.AddAsset(comp.SoundAsset);
-
-			// pack sound files
-			var clipRefs = comp.SoundAsset.Clips != null
-				? comp.SoundAsset.Clips.Select(files.Add).ToArray()
-				: Array.Empty<string>();
-
 			return PackageApi.Packer.Pack(new SoundReferencesPackable {
-				SoundAssetRef = assetRef,
-				ClipRefs = clipRefs
+				SoundAssetRef = files.AddAsset(comp.SoundAsset),
 			});
 		}
 
@@ -136,7 +125,6 @@ public static void Unpack(byte[] bytes, SoundComponent comp, PackagedFiles files
 		{
 			var data = PackageApi.Packer.Unpack<SoundReferencesPackable>(bytes);
 			comp.SoundAsset = files.GetAsset<SoundAsset>(data.SoundAssetRef);
-			comp.SoundAsset.Clips = data.ClipRefs.Select(files.GetAudioClip).ToArray();
 		}
 	}