mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More logs, player loop moved to a thread

Browse Source
This commit is contained in:
Master Kwoth 2017-07-05 18:53:21 +02:00
parent fbedf5878b
commit 98e2b0ce37
2 changed files with 182 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/NadekoBot/Services/Music/MusicPlayer.cs
View File

@ -20,7 +20,7 @@ namespace NadekoBot.Services.Music
} }
public class MusicPlayer public class MusicPlayer
{ {
private readonly Task _player; private readonly Thread _player;
public IVoiceChannel VoiceChannel { get; private set; } public IVoiceChannel VoiceChannel { get; private set; }
private readonly Logger _log; private readonly Logger _log;
@ -138,7 +138,12 @@ namespace NadekoBot.Services.Music
_log.Info("Initialized"); _log.Info("Initialized");
_player = Task.Run(async () => _player = new Thread(new ThreadStart(PlayerLoop));
_player.Start();
_log.Info("Loop started");
}
private async void PlayerLoop()
{ {
while (!Exited) while (!Exited)
{ {
@ -319,7 +324,6 @@ namespace NadekoBot.Services.Music
} }
while ((Queue.Count == 0 || Stopped) && !Exited); while ((Queue.Count == 0 || Stopped) && !Exited);
} }
}, SongCancelSource.Token);
} }
public void SetIndex(int index) public void SetIndex(int index)

4
src/NadekoBot/Services/Music/MusicService.cs
View File

@ -44,6 +44,7 @@ namespace NadekoBot.Services.Music
_sc = sc; _sc = sc;
_creds = creds; _creds = creds;
_log = LogManager.GetCurrentClassLogger(); _log = LogManager.GetCurrentClassLogger();
_yt = YouTube.Default;
try { Directory.Delete(MusicDataPath, true); } catch { } try { Directory.Delete(MusicDataPath, true); } catch { }
@ -329,7 +330,7 @@ namespace NadekoBot.Services.Music
return (null, null); return (null, null);
} }
_log.Info("Getting all videos"); _log.Info("Getting all videos");
var allVideos = await Task.Run(async () => { try { return await YouTube.Default.GetAllVideosAsync(link).ConfigureAwait(false); } catch { return Enumerable.Empty<YouTubeVideo>(); } }).ConfigureAwait(false); var allVideos = await Task.Run(async () => { try { return await _yt.GetAllVideosAsync(link).ConfigureAwait(false); } catch { return Enumerable.Empty<YouTubeVideo>(); } }).ConfigureAwait(false);
var videos = allVideos.Where(v => v.AdaptiveKind == AdaptiveKind.Audio); var videos = allVideos.Where(v => v.AdaptiveKind == AdaptiveKind.Audio);
var video = videos var video = videos
.Where(v => v.AudioBitrate < 256) .Where(v => v.AudioBitrate < 256)
@ -358,6 +359,7 @@ namespace NadekoBot.Services.Music
private readonly Regex m3uRegex = new Regex("(?<url>^[^#].*)", RegexOptions.Compiled | RegexOptions.Multiline); private readonly Regex m3uRegex = new Regex("(?<url>^[^#].*)", RegexOptions.Compiled | RegexOptions.Multiline);
private readonly Regex asxRegex = new Regex("<ref href=\"(?<url>.*?)\"", RegexOptions.Compiled); private readonly Regex asxRegex = new Regex("<ref href=\"(?<url>.*?)\"", RegexOptions.Compiled);
private readonly Regex xspfRegex = new Regex("<location>(?<url>.*?)</location>", RegexOptions.Compiled); private readonly Regex xspfRegex = new Regex("<location>(?<url>.*?)</location>", RegexOptions.Compiled);
private readonly YouTube _yt;
private async Task<string> HandleStreamContainers(string query) private async Task<string> HandleStreamContainers(string query)
{ {