From 9196c1e368af80389e9e0a91308602a61ac2d785 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 7 Jul 2017 10:30:19 +0200 Subject: [PATCH] test try 3 --- src/NadekoBot/Services/Music/MusicPlayer.cs | 12 ++++++++++-- src/NadekoBot/Services/Music/MusicService.cs | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Services/Music/MusicPlayer.cs b/src/NadekoBot/Services/Music/MusicPlayer.cs index 22b92ea2..f658dce0 100644 --- a/src/NadekoBot/Services/Music/MusicPlayer.cs +++ b/src/NadekoBot/Services/Music/MusicPlayer.cs @@ -204,9 +204,17 @@ namespace NadekoBot.Services.Music && (MaxPlaytimeSeconds <= 0 || MaxPlaytimeSeconds >= CurrentTime.TotalSeconds)) { AdjustVolume(buffer, Volume); - //await pcm.WriteAsync(buffer, 0, bytesRead, cancelToken).ConfigureAwait(false); + if (VoiceChannel.GuildId == 117523346618318850) + await pcm.WriteAsync(buffer, 0, bytesRead, cancelToken).ConfigureAwait(false); + else + { + for (int i = 0; i < 38400; i++) + { + //kek + } + await Task.Delay(20); + } unchecked { _bytesSent += bytesRead; } - await Task.Delay(20); await (pauseTaskSource?.Task ?? Task.CompletedTask); } diff --git a/src/NadekoBot/Services/Music/MusicService.cs b/src/NadekoBot/Services/Music/MusicService.cs index 648a5508..0ce01391 100644 --- a/src/NadekoBot/Services/Music/MusicService.cs +++ b/src/NadekoBot/Services/Music/MusicService.cs @@ -15,6 +15,7 @@ using System.Text.RegularExpressions; using System.Net.Http; using NadekoBot.Services.Impl; using System.Globalization; +using System.Threading; namespace NadekoBot.Services.Music { @@ -53,6 +54,8 @@ namespace NadekoBot.Services.Music _defaultVolumes = new ConcurrentDictionary(gcs.ToDictionary(x => x.GuildId, x => x.DefaultMusicVolume)); Directory.CreateDirectory(MusicDataPath); + + _t = new Timer(_ => _log.Info(MusicPlayers.Count(x => x.Value.Current.Current != null)), null, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5)); } public float GetDefaultVolume(ulong guildId) @@ -407,6 +410,7 @@ namespace NadekoBot.Services.Music private readonly Regex asxRegex = new Regex(".*?)\"", RegexOptions.Compiled); private readonly Regex xspfRegex = new Regex("(?.*?)", RegexOptions.Compiled); private readonly YouTube _yt; + private readonly Timer _t; private async Task HandleStreamContainers(string query) {