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

music bs

Browse Source
This commit is contained in:
Master Kwoth 2016-02-21 05:56:29 +01:00
parent 7c12169d9c
commit 7874cb1728
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ namespace NadekoBot.Classes.Music {
buffer.Position = newPos; buffer.Position = newPos;
} }
} }
int blockSize = 2048; int blockSize = 1920 * NadekoBot.client.GetService<AudioService>()?.Config?.Channels ?? 3840;
var buf = new byte[blockSize]; var buf = new byte[blockSize];
int read = 0; int read = 0;
read = await p.StandardOutput.BaseStream.ReadAsync(buf, 0, blockSize); read = await p.StandardOutput.BaseStream.ReadAsync(buf, 0, blockSize);
@ -264,7 +264,7 @@ namespace NadekoBot.Classes.Music {
Console.WriteLine("Nothing was buffered, try another song and check your GoogleApikey."); Console.WriteLine("Nothing was buffered, try another song and check your GoogleApikey.");
} }
int blockSize = 1920 * NadekoBot.client.GetService<AudioService>().Config.Channels; int blockSize = 1920 * NadekoBot.client.GetService<AudioService>()?.Config?.Channels ?? 3840;
byte[] voiceBuffer = new byte[blockSize]; byte[] voiceBuffer = new byte[blockSize];
if (parent.OnStarted != null) if (parent.OnStarted != null)
@ -354,15 +354,19 @@ namespace NadekoBot.Classes.Music {
} }
public override int Read(byte[] buffer, int offset, int count) { public override int Read(byte[] buffer, int offset, int count) {
Position = readPos; lock (this) {
int read = base.Read(buffer, offset, count); Position = readPos;
readPos = Position; int read = base.Read(buffer, offset, count);
return read; readPos = Position;
return read;
}
} }
public override void Write(byte[] buffer, int offset, int count) { public override void Write(byte[] buffer, int offset, int count) {
Position = writePos; lock (this) {
base.Write(buffer, offset, count); Position = writePos;
writePos = Position; base.Write(buffer, offset, count);
writePos = Position;
}
} }
} }
} }