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

.leaveall leaves all except current. Back to extractor

Browse Source
This commit is contained in:
Master Kwoth
2016-01-30 22:34:38 +01:00
parent db94133f3b
commit dbeb2b55ab
5 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NadekoBot/Classes/Music/StreamRequest.cs
View File

@@ -12,7 +12,7 @@ using System.Diagnostics;
using NadekoBot.Extensions;
using System.Threading;
using Timer = System.Timers.Timer;
using VideoLibrary;
using YoutubeExtractor;
namespace NadekoBot.Classes.Music {
public enum StreamState {
@@ -55,14 +55,14 @@ namespace NadekoBot.Classes.Music {
}
private async Task ResolveStreamLink() {
VideoLibrary.YouTubeVideo video = null;
VideoInfo video = null;
try {
if (OnResolving != null)
OnResolving();
Console.WriteLine("Resolving video link");
video = (await YouTube.Default.GetAllVideosAsync(Searches.FindYoutubeUrlByKeywords(Query)))
.Where(v => v.AdaptiveKind == AdaptiveKind.Audio)
video = DownloadUrlResolver.GetDownloadUrls(Searches.FindYoutubeUrlByKeywords(Query))
.Where(v => v.AdaptiveType == AdaptiveType.Audio)
.OrderByDescending(v => v.AudioBitrate)
.FirstOrDefault();
@@ -78,7 +78,7 @@ namespace NadekoBot.Classes.Music {
return;
}
musicStreamer = new MusicStreamer(this, video.Uri, Channel);
musicStreamer = new MusicStreamer(this, video.DownloadUrl, Channel);
if (OnQueued != null)
OnQueued();
return;