com.tunnelsnakes.audiosystem 2.0.4 → 2.0.6

packages/Runtime/Scripts/Audio/AudioManager.cs

@@ -6,9 +6,9 @@ using UnityEngine;
 public static class AudioManager {
     private static Transform _container = default;
     private static Queue<AudioPresenter> _freePresenters = new Queue<AudioPresenter>();
-
-    public static int CreatedPresenters { get; private set; }
-    public static int FreePresenters => _freePresenters.Count;
+
+    public static int CreatedPresenters { get; private set; }
+    public static int FreePresenters => _freePresenters.Count;
 
     public static AudioPresenter GetFreeAudioPresenter() {
         AudioPresenter presenter;
@@ -16,7 +16,7 @@ public static class AudioManager {
             if (_freePresenters.Count != 0) {
                 presenter = _freePresenters.Dequeue();
             } else {
-                presenter = GetContainer().gameObject.AddComponent<AudioPresenter>();
+                presenter = GetContainer().gameObject.AddComponent<AudioPresenter>();
                 CreatedPresenters++;
             }
         } while (presenter == null);
@@ -32,7 +32,7 @@ public static class AudioManager {
         while (_freePresenters.Count != 0) {
             AudioPresenter presenter = _freePresenters.Dequeue();
             if (presenter != null) {
-                MonoBehaviour.Destroy(presenter.AudioSource);
+                MonoBehaviour.Destroy(presenter.AudioSource);
                 MonoBehaviour.Destroy(presenter);
             }
         }

packages/Runtime/Scripts/Audio/AudioPresenter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditorInternal;
 using UnityEngine;
 
 [ExecuteAlways]
@@ -10,7 +9,7 @@ public class AudioPresenter : MonoBehaviour {
     private Vibration _vibration;
     private Observable<bool> _isAudioEnable;
     private Observable<float> _audioGlobalVolume;
-
+
     public AudioSource AudioSource => _audioSource;
     public bool IsPlaying => _audioSource.isPlaying;
     public float Volume { get; set; }
@@ -54,24 +53,24 @@ public class AudioPresenter : MonoBehaviour {
         }
         _audioGlobalVolume = volume;
         _audioGlobalVolume.AddSubscriberAndInvoke(UpdateVolume);
-    }
-
-    #region Actions
-
+    }
+
+    #region Actions
+
     public void Play(float delay) {
         StartCoroutine(DelayedAction(Play, delay));
     }
 
     public void Stop(float delay) {
         StartCoroutine(DelayedAction(Stop, delay));
-    }
-
+    }
+
     public void Pause(float delay) {
-        StartCoroutine(DelayedAction(Pause, delay));
-    }
-
+        StartCoroutine(DelayedAction(Pause, delay));
+    }
+
     public void UnPause(float delay) {
-        StartCoroutine(DelayedAction(UnPause, delay));
+        StartCoroutine(DelayedAction(UnPause, delay));
     }
 
     public void Play() {
@@ -84,33 +83,33 @@ public class AudioPresenter : MonoBehaviour {
         _audioSource.Stop();
         StopAllCoroutines();
         AudioManager.SaveAudioPresenter(this);
-    }
-
-    public void Pause() {
-        _audioSource.Pause();
-    }
-
-    public void UnPause() {
-        _audioSource.UnPause();
+    }
+
+    public void Pause() {
+        _audioSource.Pause();
+    }
+
+    public void UnPause() {
+        _audioSource.UnPause();
     }
 
     private IEnumerator DelayedAction(Action action, float time) {
         yield return new WaitForSeconds(time);
         action?.Invoke();
-    }
-
+    }
+
     #endregion
-
+
     private IEnumerator WaitForEnd() {
         var time = new WaitForFixedUpdate();
         //while (_audioSource.isPlaying || ((_audioSource.timeSamples != 0) && (_audioSource.timeSamples != _audioSource.clip.samples))) { //Ended or stopped, not paused
         //    yield return time;
-        //}
-        bool isPlayingInPrevFrame, isPlaying = false;
-        do {
-            isPlayingInPrevFrame = isPlaying;
-            isPlaying = _audioSource.isPlaying || ((_audioSource.timeSamples != 0) && (_audioSource.timeSamples != _audioSource.clip.samples));
-            yield return time;
+        //}
+        bool isPlayingInPrevFrame, isPlaying = false;
+        do {
+            isPlayingInPrevFrame = isPlaying;
+            isPlaying = _audioSource.isPlaying || ((_audioSource.timeSamples != 0) && (_audioSource.timeSamples != _audioSource.clip.samples));
+            yield return time;
         } while (isPlaying || isPlayingInPrevFrame);
         Stop();
     }
@@ -120,7 +119,6 @@ public class AudioPresenter : MonoBehaviour {
     }
 
     private void UpdateVolume(Observable<float> observable, float oldVolume, float newVolume) {
-        _audioGlobalVolume = newVolume;
         UpdateVolume();
     }
 

packages/Runtime/Scripts/Audio/Sound.cs

@@ -25,8 +25,8 @@ public class Sound : ScriptableObject {
         presenter.Play();
 
         return presenter;
-    }
-
+    }
+
     /// <summary>
     /// Mostly for Unity events
     /// </summary>
@@ -34,13 +34,13 @@ public class Sound : ScriptableObject {
 #if UNITY_EDITOR && ODIN_INSPECTOR
     [Sirenix.OdinInspector.Button]
 #endif
-    public void SimplePlay() {
-        if (Application.isPlaying) {
-            Play();
-        }
-        else {
-            AudioPresenter presenter = GetPresenter();
-            presenter.AudioSource.PlayOneShot(_audioClip);
+    public void SimplePlay() {
+        if (Application.isPlaying) {
+            Play();
+        }
+        else {
+            AudioPresenter presenter = GetPresenter();
+            presenter.AudioSource.PlayOneShot(_audioClip);
         }
     }
 

packages/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.tunnelsnakes.audiosystem",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "displayName": "TS AudioSystem",
   "description": "Audio and vibrations",
   "license": "proprietary",