From 3e65fcf47b116122e10704a26d36ef79c5093c89 Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Mon, 9 Apr 2018 19:17:03 +0200 Subject: Play Audio async --- DiscoBot/Auxiliary/Soundeffects.cs | 7 ++++--- DiscoBot/Commands/Voice.cs | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DiscoBot/Auxiliary/Soundeffects.cs b/DiscoBot/Auxiliary/Soundeffects.cs index 880753d..eb79177 100644 --- a/DiscoBot/Auxiliary/Soundeffects.cs +++ b/DiscoBot/Auxiliary/Soundeffects.cs @@ -21,7 +21,7 @@ namespace DiscoBot.Auxiliary public static class SoundEffects { - public static Task Play(Sound s) + public static async Task Play(Sound s) { string url = string.Empty; int vol = 256; @@ -51,10 +51,11 @@ namespace DiscoBot.Auxiliary if (url != string.Empty) { - return Voice.SendAsync(url, vol); + await Task.Run(() => Voice.SendAsync(url, vol)); + return; } - return Dsa.GeneralContext.Channel.SendMessageAsync("Ton Existiert nicht"); + await Dsa.GeneralContext.Channel.SendMessageAsync("Ton Existiert nicht"); } } } diff --git a/DiscoBot/Commands/Voice.cs b/DiscoBot/Commands/Voice.cs index 7b28965..7ffb029 100644 --- a/DiscoBot/Commands/Voice.cs +++ b/DiscoBot/Commands/Voice.cs @@ -30,6 +30,7 @@ var discord = Client.CreatePCMStream(AudioApplication.Music); await output.CopyToAsync(discord); + await discord.FlushAsync(); } @@ -65,11 +66,11 @@ } [Command("play")] - public Task PlayAudioAsync(string path) + public async Task PlayAudioAsync(string path) { if (Client == null) { - return this.Context.Channel.SendMessageAsync("Erst Joinen!"); + await this.Context.Channel.SendMessageAsync("Erst Joinen!"); } var sounds = Enum.GetValues(typeof(Sound)); @@ -85,10 +86,10 @@ if (sc.Compare(path, tSound.ToString()) > SpellCorrect.ErrorThreshold) { - return SendAsync(path); + await Task.Run(() => Voice.SendAsync(path)); } - return SoundEffects.Play(tSound); + await Task.Run(() => SoundEffects.Play(tSound)); } private static Process CreateStream(string path, int vol = 256) -- cgit v1.2.3-54-g00ecf