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

music maybe better?

Browse Source
This commit is contained in:
Master Kwoth 2016-02-19 02:20:28 +01:00
parent e1f5ba8169
commit 6dcc8dfc01
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,9 +208,10 @@ namespace NadekoBot.Classes.Music {
buffer.Position = newPos; buffer.Position = newPos;
} }
} }
var buf = new byte[4096]; int blockSize = 1024;
var buf = new byte[blockSize];
int read = 0; int read = 0;
read = await p.StandardOutput.BaseStream.ReadAsync(buf, 0, buf.Length); read = await p.StandardOutput.BaseStream.ReadAsync(buf, 0, blockSize);
//Console.WriteLine($"Read: {read}"); //Console.WriteLine($"Read: {read}");
if (read == 0) { if (read == 0) {
if (attempt == 5) { if (attempt == 5) {
@ -230,7 +231,9 @@ namespace NadekoBot.Classes.Music {
} }
else { else {
attempt = 0; attempt = 0;
await buffer.WriteAsync(buf, 0, read); lock (_bufferLock) {
buffer.Write(buf, 0, read);
}
} }
} }
} }
@ -277,12 +280,12 @@ namespace NadekoBot.Classes.Music {
//adjust volume //adjust volume
lock (_bufferLock) { lock (_bufferLock) {
readCount = buffer.Read(voiceBuffer, 0, voiceBuffer.Length); readCount = buffer.Read(voiceBuffer, 0, blockSize);
} }
if (readCount == 0) { if (readCount == 0) {
if (attempt == 4) { if (attempt == 4) {
Console.WriteLine($"Failed to read {attempt} times. Breaking out. [{DateTime.Now.Second}]"); Console.WriteLine($"Failed to read {attempt} times. Breaking out.");
break; break;
} }
else { else {
@ -298,7 +301,7 @@ namespace NadekoBot.Classes.Music {
break; break;
} }
voiceBuffer = adjustVolume(voiceBuffer, parent.Volume); voiceBuffer = adjustVolume(voiceBuffer, parent.Volume);
parent.MusicControls.VoiceClient.Send(voiceBuffer, 0, voiceBuffer.Length); parent.MusicControls.VoiceClient.Send(voiceBuffer, 0, readCount);
while (IsPaused) { while (IsPaused) {
await Task.Delay(50); await Task.Delay(50);
@ -355,21 +358,15 @@ namespace NadekoBot.Classes.Music {
} }
public override int Read(byte[] buffer, int offset, int count) { public override int Read(byte[] buffer, int offset, int count) {
int read;
lock (this) {
Position = readPos; Position = readPos;
read = base.Read(buffer, offset, count); int read = base.Read(buffer, offset, count);
readPos = Position; readPos = Position;
}
return read; return read;
} }
public override void Write(byte[] buffer, int offset, int count) { public override void Write(byte[] buffer, int offset, int count) {
lock (this) {
Position = writePos; Position = writePos;
base.Write(buffer, offset, count); base.Write(buffer, offset, count);
writePos = Position; writePos = Position;
} }
} }
} }
}