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

minor change before submoduling discord.net

Browse Source
This commit is contained in:
Master Kwoth 2016-03-04 12:27:49 +01:00
parent 80e69addaa
commit 1626ae9a07
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
NadekoBot/Classes/Music/Song.cs
View File

@ -167,20 +167,10 @@ namespace NadekoBot.Classes.Music {
Console.WriteLine($"Buffering done." + $" [{songBuffer.ContentLength}]"); Console.WriteLine($"Buffering done." + $" [{songBuffer.ContentLength}]");
if (p != null) { if (p != null) {
try { try {
p.CancelOutputRead(); p.Kill();
} catch { } }
try { catch {}
p.StandardOutput.Dispose(); p.Dispose();
} catch { }
try {
p.CloseMainWindow();
} catch { }
try {
p.Close();
} catch { }
try {
p.Dispose();
} catch { }
} }
} }
}); });
@ -326,7 +316,7 @@ namespace NadekoBot.Classes.Music {
} }
if (query.Contains(".m3u")) { if (query.Contains(".m3u")) {
/* /*
# This is a comment # This is a comment
C:\xxx4xx\xxxxxx3x\xx2xxxx\xx.mp3 C:\xxx4xx\xxxxxx3x\xx2xxxx\xx.mp3
C:\xxx5xx\x6xxxxxx\x7xxxxx\xx.mp3 C:\xxx5xx\x6xxxxxx\x7xxxxx\xx.mp3
*/ */

4
NadekoBot/Modules/Music.cs
View File

@ -102,12 +102,12 @@ namespace NadekoBot.Modules {
await e.Channel.SendMessage("🎵 No active music musicPlayer."); await e.Channel.SendMessage("🎵 No active music musicPlayer.");
return; return;
} }
string toSend = "🎵 **" + musicPlayer.Playlist.Count + "** `tracks currently queued.` "; var toSend = "🎵 **" + musicPlayer.Playlist.Count + "** `tracks currently queued.` ";
if (musicPlayer.Playlist.Count >= MusicPlayer.MaximumPlaylistSize) if (musicPlayer.Playlist.Count >= MusicPlayer.MaximumPlaylistSize)
toSend += "**Song queue is full!**\n"; toSend += "**Song queue is full!**\n";
else else
toSend += "\n"; toSend += "\n";
int number = 1; var number = 1;
await e.Channel.SendMessage(toSend + string.Join("\n", musicPlayer.Playlist.Take(15).Select(v => $"`{number++}.` {v.PrettyName}"))); await e.Channel.SendMessage(toSend + string.Join("\n", musicPlayer.Playlist.Take(15).Select(v => $"`{number++}.` {v.PrettyName}")));
}); });