net.dreditor.audio 0.1.6 → 0.1.7

package/MusicManager.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 414cacea6a270a94aa629219f679f17d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 414cacea6a270a94aa629219f679f17d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/MusicManagerBase.cs

@@ -1,115 +1,115 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.EventObjects;
-#if FMOD_UNITY
-using FMODUnity;
-#endif
-using System;
-using UnityEngine;
-
-namespace DREditor.Audio
-{
-    /// <summary>
-    ///
-    /// </summary>
-    /// <remarks></remarks>
-    public abstract class MusicManagerBase : SoundService<MusicManagerBase>
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-
-        [Tooltip("")]
-        [SerializeField] protected StringWithEvent SetMusicText = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SceneEvent ClearMusicText = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SceneEvent ResetMusicText = null;
-
-#if FMOD_UNITY
-        /// <summary>
-        ///
-        /// </summary>
-        public event Action<StudioEventEmitter> OnMusicChange;
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="musicSource"></param>
-        protected virtual void InvokeMusicChange(StudioEventEmitter musicSource) => OnMusicChange?.Invoke(musicSource);
-
-#else
-        /// <summary>
-        ///
-        /// </summary>
-        public event Action<AudioSource> OnMusicChange;
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="musicSource"></param>
-        protected virtual void InvokeMusicChange(AudioSource musicSource) => OnMusicChange?.Invoke(musicSource);
-#endif
-
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="eventName"></param>
-        /// <param name="skip"></param>
-        public abstract void PlayMusic<T>(T eventName, bool skip = false);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        public abstract bool MusicIsPlaying();
-
-        /// <summary>
-        ///
-        /// </summary>
-        public abstract void StopPlayingMusic();
-
-        /// <summary>
-        ///
-        /// </summary>
-        public abstract void PlayLastMusic();
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected abstract void ResetLastPlayedMusic();
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="duration"></param>
-        public abstract void FadeMusic(float duration = 1);
-
-        /// <summary>
-        ///
-        /// </summary>
-        public abstract void StopMusic();
-
-        /// <summary>
-        ///
-        /// </summary>
-        public abstract void StopSound();
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        public abstract string GetLastPlayedMusic();
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.EventObjects;
+#if FMOD_UNITY
+using FMODUnity;
+#endif
+using System;
+using UnityEngine;
+
+namespace DREditor.Audio
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <remarks></remarks>
+    public abstract class MusicManagerBase : SoundService<MusicManagerBase>
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+
+        [Tooltip("")]
+        [SerializeField] protected StringWithEvent SetMusicText = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SceneEvent ClearMusicText = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SceneEvent ResetMusicText = null;
+
+#if FMOD_UNITY
+        /// <summary>
+        ///
+        /// </summary>
+        public event Action<StudioEventEmitter> OnMusicChange;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="musicSource"></param>
+        protected virtual void InvokeMusicChange(StudioEventEmitter musicSource) => OnMusicChange?.Invoke(musicSource);
+
+#else
+        /// <summary>
+        ///
+        /// </summary>
+        public event Action<AudioSource> OnMusicChange;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="musicSource"></param>
+        protected virtual void InvokeMusicChange(AudioSource musicSource) => OnMusicChange?.Invoke(musicSource);
+#endif
+
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="eventName"></param>
+        /// <param name="skip"></param>
+        public abstract void PlayMusic<T>(T eventName, bool skip = false);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public abstract bool MusicIsPlaying();
+
+        /// <summary>
+        ///
+        /// </summary>
+        public abstract void StopPlayingMusic();
+
+        /// <summary>
+        ///
+        /// </summary>
+        public abstract void PlayLastMusic();
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected abstract void ResetLastPlayedMusic();
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="duration"></param>
+        public abstract void FadeMusic(float duration = 1);
+
+        /// <summary>
+        ///
+        /// </summary>
+        public abstract void StopMusic();
+
+        /// <summary>
+        ///
+        /// </summary>
+        public abstract void StopSound();
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public abstract string GetLastPlayedMusic();
+    }
 }

package/MusicManagerBase.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 35cea5ed13d7d1643ab1d44e21d2c00c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 35cea5ed13d7d1643ab1d44e21d2c00c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/MusicSaver.cs

@@ -1,127 +1,127 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.EventObjects;
-using DREditor.Saving;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace DREditor.Audio
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(IDRESaveable) + ", " + nameof(IDRELoadable) + ", " + nameof(ISceneEventListener) +
-        "\n\n")]
-    public class MusicSaver : MonoBehaviour, IDRESaveable, IDRELoadable, ISceneEventListener
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SceneEvent onFadingOutOfLoading = null;
-
-#if FMOD_UNITY
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected MusicManager musicManager;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string musicSaveKey = "MusicData";
-#else
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected MusicManager musicManager;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected Playlist jukeBox = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string musicSaveKey = "MusicData";
-#endif
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected string loadedMusic = "";
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected bool registered = false;
-
-
-        /// <inheritdoc/>
-        public virtual void Save(Dictionary<string, object> saveDatas) => saveDatas[musicSaveKey] = SaveMusic();
-
-        /// <inheritdoc/>
-        public virtual void Load(Dictionary<string, object> saveDatas) => LoadMusic(saveDatas[musicSaveKey] as string);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual string SaveMusic() => musicManager.GetLastPlayedMusic();
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        protected virtual void LoadMusic(string name)
-        {
-            if (name is string loadName && loadName != "")
-            {
-                loadedMusic = loadName;
-
-                if (registered)
-                    return;
-
-                onFadingOutOfLoading.RegisterListener(this);
-
-                registered = true;
-            }
-            else
-                musicManager.OnLoadedMusicMissing();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="loadName"></param>
-        protected virtual void LoadValidMusic(string loadName)
-        {
-#if FMOD_UNITY
-            musicManager.PlayValidMusic(loadName);
-#else
-            musicManager.PlayMusic(jukeBox.GetAudioClip(loadName));
-#endif
-        }
-
-
-        /// <inheritdoc/>
-        public virtual void OnEventRaised()
-        {
-            if (!registered)
-                return;
-
-            onFadingOutOfLoading.UnregisterListener(this);
-
-            registered = false;
-
-            LoadValidMusic(loadedMusic);
-        }
-
-        protected virtual void OnDestroy() => onFadingOutOfLoading.UnregisterListener(this);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.EventObjects;
+using DREditor.Saving;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace DREditor.Audio
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(IDRESaveable) + ", " + nameof(IDRELoadable) + ", " + nameof(ISceneEventListener) +
+        "\n\n")]
+    public class MusicSaver : MonoBehaviour, IDRESaveable, IDRELoadable, ISceneEventListener
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SceneEvent onFadingOutOfLoading = null;
+
+#if FMOD_UNITY
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected MusicManager musicManager;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string musicSaveKey = "MusicData";
+#else
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected MusicManager musicManager;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected Playlist jukeBox = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string musicSaveKey = "MusicData";
+#endif
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected string loadedMusic = "";
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected bool registered = false;
+
+
+        /// <inheritdoc/>
+        public virtual void Save(Dictionary<string, object> saveDatas) => saveDatas[musicSaveKey] = SaveMusic();
+
+        /// <inheritdoc/>
+        public virtual void Load(Dictionary<string, object> saveDatas) => LoadMusic(saveDatas[musicSaveKey] as string);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual string SaveMusic() => musicManager.GetLastPlayedMusic();
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        protected virtual void LoadMusic(string name)
+        {
+            if (name is string loadName && loadName != "")
+            {
+                loadedMusic = loadName;
+
+                if (registered)
+                    return;
+
+                onFadingOutOfLoading.RegisterListener(this);
+
+                registered = true;
+            }
+            else
+                musicManager.OnLoadedMusicMissing();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="loadName"></param>
+        protected virtual void LoadValidMusic(string loadName)
+        {
+#if FMOD_UNITY
+            musicManager.PlayValidMusic(loadName);
+#else
+            musicManager.PlayMusic(jukeBox.GetAudioClip(loadName));
+#endif
+        }
+
+
+        /// <inheritdoc/>
+        public virtual void OnEventRaised()
+        {
+            if (!registered)
+                return;
+
+            onFadingOutOfLoading.UnregisterListener(this);
+
+            registered = false;
+
+            LoadValidMusic(loadedMusic);
+        }
+
+        protected virtual void OnDestroy() => onFadingOutOfLoading.UnregisterListener(this);
+    }
 }

package/MusicSaver.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 1318cbdd253c5ef40b12caf262351cef
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 1318cbdd253c5ef40b12caf262351cef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: