From 7874cb17282fa5c78169dc3d0cae133cce20cae6 Mon Sep 17 00:00:00 2001
From: Master Kwoth <srki0509@gmail.com>
Date: Sun, 21 Feb 2016 05:56:29 +0100
Subject: [PATCH] music bs

---
 NadekoBot/Classes/Music/StreamRequest.cs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/NadekoBot/Classes/Music/StreamRequest.cs b/NadekoBot/Classes/Music/StreamRequest.cs
index acc3ad83..5d04a745 100644
--- a/NadekoBot/Classes/Music/StreamRequest.cs
+++ b/NadekoBot/Classes/Music/StreamRequest.cs
@@ -205,7 +205,7 @@ namespace NadekoBot.Classes.Music {
                         buffer.Position = newPos;
                     }
                 }
-                int blockSize = 2048;
+                int blockSize = 1920 * NadekoBot.client.GetService<AudioService>()?.Config?.Channels ?? 3840;
                 var buf = new byte[blockSize];
                 int read = 0;
                 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.");
             }
 
-            int blockSize = 1920 * NadekoBot.client.GetService<AudioService>().Config.Channels;
+            int blockSize = 1920 * NadekoBot.client.GetService<AudioService>()?.Config?.Channels ?? 3840;
             byte[] voiceBuffer = new byte[blockSize];
 
             if (parent.OnStarted != null)
@@ -354,15 +354,19 @@ namespace NadekoBot.Classes.Music {
         }
 
         public override int Read(byte[] buffer, int offset, int count) {
-            Position = readPos;
-            int read = base.Read(buffer, offset, count);
-            readPos = Position;
-            return read;
+            lock (this) {
+                Position = readPos;
+                int read = base.Read(buffer, offset, count);
+                readPos = Position;
+                return read;
+            }
         }
         public override void Write(byte[] buffer, int offset, int count) {
-            Position = writePos;
-            base.Write(buffer, offset, count);
-            writePos = Position;
+            lock (this) {
+                Position = writePos;
+                base.Write(buffer, offset, count);
+                writePos = Position;
+            }
         }
     }
 }