async content loader, load music async

Assets/Scripts/OpenTS2/Audio/MusicController.cs

@@ -152,11 +152,10 @@ private void OnLotLoaded()
 
         private void PlayNextSong()
         {
+            StopAllCoroutines();
             var contentManager = ContentManager.Instance;
             var currentSong = _currentMusicCategory.PopNextSong();
-            var songAsset = contentManager.GetAsset<AudioAsset>(currentSong.Key);
-            _tsAudioSource.Audio = songAsset;
-            _tsAudioSource.Play();
+            _tsAudioSource.PlayAsync(currentSong.Key);
         }
 
         private void OnSongEnd()

Assets/Scripts/OpenTS2/Audio/TSAudioSource.cs

@@ -2,6 +2,7 @@
 using NAudio.Wave;
 using NAudio.Wave.SampleProviders;
 using OpenTS2.Audio;
+using OpenTS2.Common;
 using OpenTS2.Content;
 using OpenTS2.Content.DBPF;
 using System;
@@ -38,6 +39,7 @@ public AudioAsset Audio
     private float _timeAudioSourcePlaying = 0f;
     private bool _audioClipPlaying = false;
     private bool _paused = false;
+    private AsyncContentManager _asyncContentLoader;
 
     public void Pause()
     {
@@ -69,6 +71,23 @@ public void Play()
         PlayInternal(Audio);
     }
 
+    public void PlayAsync(ResourceKey audioResourceKey)
+    {
+        CleanUp();
+        StartCoroutine(PlayAsyncInternal(audioResourceKey));
+    }
+
+    private IEnumerator PlayAsyncInternal(ResourceKey key)
+    {
+        var audioRequest = _asyncContentLoader.RequestAsset(key);
+        while (!audioRequest.Finished)
+            yield return null;
+        if (audioRequest.Result == AsyncContentManager.Results.Success)
+            PlayInternal(audioRequest.Asset as AudioAsset);
+        else
+            Stop();
+    }
+
     private void PlayInternal(AudioAsset asset)
     {
         if (asset is HitListAsset)
@@ -90,6 +109,7 @@ public void Stop()
 
     private void Awake()
     {
+        _asyncContentLoader = AsyncContentManager.Instance;
         _audioSource = GetComponent<AudioSource>();
         if (_audioSource == null)
         {
@@ -100,6 +120,7 @@ private void Awake()
 
     private void CleanUp()
     {
+        StopAllCoroutines();
         if (_waveOutEv != null)
         {
             _waveOutEv.PlaybackStopped -= WaveOutPlaybackStopped;

Assets/Scripts/OpenTS2/Content/AsyncContentManager.cs

@@ -0,0 +1,64 @@
+using OpenTS2.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace OpenTS2.Content
+{
+    public class AsyncContentManager
+    {
+        public class Request
+        {
+            public bool Finished = false;
+            public Results Result;
+            public ResourceKey Key;
+            public AbstractAsset Asset;
+        }
+        public enum Results
+        {
+            Success,
+            Failed
+        }
+        public static AsyncContentManager Instance { get; private set; }
+        private Thread _thread;
+        private Queue<Request> _requests = new Queue<Request>();
+        private ContentManager _contentManager;
+        public AsyncContentManager()
+        {
+            Instance = this;
+            _contentManager = ContentManager.Instance;
+            _thread = new Thread(new ThreadStart(ThreadLoop));
+            _thread.IsBackground = true;
+            _thread.Name = "AsyncContentLoader";
+            _thread.Start();
+        }
+
+        public Request RequestAsset(ResourceKey key)
+        {
+            var request = new Request();
+            request.Key = key;
+            _requests.Enqueue(request);
+            return request;
+        }
+
+        private void ThreadLoop()
+        {
+            while (true)
+            {
+                if (_requests.Count > 0)
+                {
+                    var request = _requests.Peek();
+                    request.Asset = _contentManager.GetAsset(request.Key);
+                    request.Result = request.Asset != null ? Results.Success : Results.Failed;
+                    request.Finished = true;
+                    _requests.Dequeue();
+                }
+                else
+                    Thread.Sleep(1);
+            }
+        }
+    }
+}

Assets/Scripts/OpenTS2/Content/DBPF/WAVAudioAsset.cs

@@ -11,18 +11,28 @@ namespace OpenTS2.Content.DBPF
 {
     public class WAVAudioAsset : AudioAsset
     {
-        public AudioClip Clip { get; private set; }
+        public AudioClip Clip
+        {
+            get
+            {
+                if (_clip == null)
+                    _clip = WAV.ToAudioClip(_data, GlobalTGI.ToString());
+                return _clip;
+            }
+        }
+        private AudioClip _clip;
+        private byte[] _data;
 
         public WAVAudioAsset(byte[] data)
         {
-            Clip = WAV.ToAudioClip(data, GlobalTGI.ToString());
+            _data = data;
         }
 
         public override void FreeUnmanagedResources()
         {
-            if (Clip == null)
+            if (_clip == null)
                 return;
-            Clip.Free();
+            _clip.Free();
         }
     }
 }

Assets/Scripts/OpenTS2/Engine/Core.cs

@@ -45,6 +45,7 @@ public static void InitializeCore()
             var nhoodManager = new NeighborhoodManager();
             var casController = new CASController();
             var lotManger = new LotManager();
+            var asyncContentLoader = new AsyncContentManager();
 
             TerrainManager.Initialize();
             MaterialManager.Initialize();