From 86ff670fb0a91baf2fb4fd49d919177a11a88626 Mon Sep 17 00:00:00 2001 From: GlenCFL Date: Fri, 8 Dec 2017 01:42:00 -0500 Subject: [PATCH] Fix for the ShChaos sound not playing. --- .../ViewModels/ItemFilterBlockViewModel.cs | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs index 936d738..d5bbe1c 100644 --- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs @@ -231,7 +231,7 @@ namespace Filtration.ViewModels public bool HasSound => Block.HasBlockItemOfType(); public bool HasPositionalSound => Block.HasBlockItemOfType(); - + public bool HasAudioVisualBlockItems => AudioVisualBlockItems.Any(); private void OnSwitchBlockItemsViewCommand() @@ -338,63 +338,63 @@ namespace Filtration.ViewModels return blockCount < blockItem.MaximumAllowed; } - private string ComputeFilePartFromNumber(string identifier) - { - if (Int32.TryParse(identifier, out int x)) - { - if (x <= 9) - { - return "AlertSound_0" + x + ".wav"; - } - else - { - return "AlertSound_" + x + ".wav"; - } - } - - return ""; + private string ComputeFilePartFromNumber(string identifier) + { + if (Int32.TryParse(identifier, out int x)) + { + if (x <= 9) + { + return "AlertSound_0" + x + ".wav"; + } + else + { + return "AlertSound_" + x + ".wav"; + } + } + + return ""; } - private string ComputeFilePartFromID(string identifier) - { - string filePart; - switch (identifier) { - case "ShGeneral": - filePart = "SH22General.wav"; - break; - case "ShBlessed": - filePart = "SH22Blessed.wav"; - break; - case "SH22Chaos": - filePart = "SH22Chaos.wav"; - break; - case "ShDivine": - filePart = "SH22Divine.wav"; - break; - case "ShExalted": - filePart = "SH22Exalted.wav"; - break; - case "ShMirror": - filePart = "SH22Mirror.wav"; - break; - case "ShAlchemy": - filePart = "SH22Alchemy.wav"; - break; - case "ShFusing": - filePart = "SH22Fusing.wav"; - break; - case "ShRegal": - filePart = "SH22Regal.wav"; - break; - case "ShVaal": - filePart = "SH22Vaal.wav"; - break; - default: - filePart = ComputeFilePartFromNumber(identifier); - break; - } - - return filePart; + private string ComputeFilePartFromID(string identifier) + { + string filePart; + switch (identifier) { + case "ShGeneral": + filePart = "SH22General.wav"; + break; + case "ShBlessed": + filePart = "SH22Blessed.wav"; + break; + case "ShChaos": + filePart = "SH22Chaos.wav"; + break; + case "ShDivine": + filePart = "SH22Divine.wav"; + break; + case "ShExalted": + filePart = "SH22Exalted.wav"; + break; + case "ShMirror": + filePart = "SH22Mirror.wav"; + break; + case "ShAlchemy": + filePart = "SH22Alchemy.wav"; + break; + case "ShFusing": + filePart = "SH22Fusing.wav"; + break; + case "ShRegal": + filePart = "SH22Regal.wav"; + break; + case "ShVaal": + filePart = "SH22Vaal.wav"; + break; + default: + filePart = ComputeFilePartFromNumber(identifier); + break; + } + + return filePart; } private void OnPlaySoundCommand() @@ -403,32 +403,32 @@ namespace Filtration.ViewModels var prefix = "Resources/AlertSounds/"; var filePart = ComputeFilePartFromID(identifier); - if (filePart == "") - { - return; + if (filePart == "") + { + return; } - else - { - _mediaPlayer.Open(new Uri(prefix + filePart, UriKind.Relative)); - _mediaPlayer.Play(); + else + { + _mediaPlayer.Open(new Uri(prefix + filePart, UriKind.Relative)); + _mediaPlayer.Play(); } } - private void OnPlayPositionalSoundCommand() - { - var identifier = BlockItems.OfType().First().Value; - var prefix = "Resources/AlertSounds/"; - var filePart = ComputeFilePartFromID(identifier); - - if (filePart == "") - { - return; - } - else - { - _mediaPlayer.Open(new Uri(prefix + filePart, UriKind.Relative)); - _mediaPlayer.Play(); - } + private void OnPlayPositionalSoundCommand() + { + var identifier = BlockItems.OfType().First().Value; + var prefix = "Resources/AlertSounds/"; + var filePart = ComputeFilePartFromID(identifier); + + if (filePart == "") + { + return; + } + else + { + _mediaPlayer.Open(new Uri(prefix + filePart, UriKind.Relative)); + _mediaPlayer.Play(); + } } private void OnBlockItemChanged(object sender, EventArgs e)