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

maybe this will fix some issues

Browse Source
This commit is contained in:
Master Kwoth 2016-01-27 06:48:48 +01:00
parent e505d407c2
commit a3d9914d36
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,17 +151,22 @@ namespace NadekoBot.Classes.Music {
Arguments = $"-i {Url} -f s16le -ar 48000 -ac 2 pipe:1", Arguments = $"-i {Url} -f s16le -ar 48000 -ac 2 pipe:1",
UseShellExecute = false, UseShellExecute = false,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = false,
CreateNoWindow = true, CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
}); });
while (true) { while (true) {
while (buffer.writePos - buffer.readPos > 2.MB() && !cancelSource.IsCancellationRequested) { while (buffer.writePos - buffer.readPos > 2.MB() && !cancelSource.IsCancellationRequested) {
await Task.Delay(1000); await Task.Delay(1000);
} }
if (cancelSource.IsCancellationRequested) return; if (cancelSource.IsCancellationRequested) {
try {
p.CancelOutputRead();
p.Close();
} catch (Exception) { }
return;
}
if (buffer.Length > 5.MB()) { // if buffer is over 10 MB, create new one if (buffer.Length > 5.MB()) { // if buffer is over 10 MB, create new one
Console.WriteLine("Buffer over 10 megs, clearing."); Console.WriteLine("Buffer over 10 megs, clearing.");
@ -189,6 +194,11 @@ namespace NadekoBot.Classes.Music {
read = await p.StandardOutput.BaseStream.ReadAsync(buf, 0, 1024); read = await p.StandardOutput.BaseStream.ReadAsync(buf, 0, 1024);
if (read == 0) { if (read == 0) {
try {
p.CancelOutputRead();
p.Close();
} catch (Exception) { }
Console.WriteLine("Didn't read anything from the stream"); Console.WriteLine("Didn't read anything from the stream");
return; return;
} }