diff --git a/NewHorizons/External/Modules/Audio/AudioMixerTrackName.cs b/NewHorizons/External/Modules/SerializableEnums/NHAudioMixerTrackName.cs similarity index 92% rename from NewHorizons/External/Modules/Audio/AudioMixerTrackName.cs rename to NewHorizons/External/Modules/SerializableEnums/NHAudioMixerTrackName.cs index 090b7f33..3765c636 100644 --- a/NewHorizons/External/Modules/Audio/AudioMixerTrackName.cs +++ b/NewHorizons/External/Modules/SerializableEnums/NHAudioMixerTrackName.cs @@ -2,10 +2,10 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.Audio +namespace NewHorizons.External.Modules.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] - public enum AudioMixerTrackName + public enum NHAudioMixerTrackName { [EnumMember(Value = @"undefined")] Undefined = 0, [EnumMember(Value = @"menu")] Menu = 1, diff --git a/NewHorizons/External/Modules/Audio/ClipSelectionType.cs b/NewHorizons/External/Modules/SerializableEnums/NHClipSelectionType.cs similarity index 76% rename from NewHorizons/External/Modules/Audio/ClipSelectionType.cs rename to NewHorizons/External/Modules/SerializableEnums/NHClipSelectionType.cs index fe6cef13..8273d4e4 100644 --- a/NewHorizons/External/Modules/Audio/ClipSelectionType.cs +++ b/NewHorizons/External/Modules/SerializableEnums/NHClipSelectionType.cs @@ -2,10 +2,10 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.Audio +namespace NewHorizons.External.Modules.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] - public enum ClipSelectionType + public enum NHClipSelectionType { [EnumMember(Value = @"random")] RANDOM, [EnumMember(Value = @"sequential")] SEQUENTIAL, diff --git a/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs b/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs index f1b692f0..dc8c0640 100644 --- a/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs +++ b/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.Audio; +using NewHorizons.External.Modules.SerializableEnums; using Newtonsoft.Json; using System.ComponentModel; using System.ComponentModel.DataAnnotations; @@ -13,12 +13,12 @@ namespace NewHorizons.External.Modules.Volumes.VolumeInfos /// public string audio; - [DefaultValue("random")] public ClipSelectionType clipSelection = ClipSelectionType.RANDOM; + [DefaultValue("random")] public NHClipSelectionType clipSelection = NHClipSelectionType.RANDOM; /// /// The audio track of this audio volume /// - [DefaultValue("environment")] public AudioMixerTrackName track = AudioMixerTrackName.Environment; + [DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment; /// /// Whether to loop this audio while in this audio volume or just play it once