From 8b59d9a76ac851324b2e6ba0e7d8c80368779d7f Mon Sep 17 00:00:00 2001
From: Andrei <b1naryth1ef@gmail.com>
Date: Sun, 9 Apr 2017 20:58:41 -0700
Subject: [PATCH] Fix some incorrect bounds checks, add MemoryBufferedPlayable

---
 disco/voice/playable.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/disco/voice/playable.py b/disco/voice/playable.py
index 8c397da..aaeb7bd 100644
--- a/disco/voice/playable.py
+++ b/disco/voice/playable.py
@@ -249,9 +249,9 @@ class DCADOpusEncoderPlayable(BasePlayable, AbstractOpus, OpusEncoder):
             def writer():
                 while True:
                     data = obj.read(2048)
-                    if data > 0:
+                    if len(data) > 0:
                         self._proc.stdin.write(data)
-                    if data < 2048:
+                    if len(data) < 2048:
                         break
 
             if source == subprocess.PIPE:
@@ -270,7 +270,7 @@ class DCADOpusEncoderPlayable(BasePlayable, AbstractOpus, OpusEncoder):
         size = struct.unpack('<h', header)[0]
 
         data = self.proc.stdout.read(size)
-        if len(data) == 0:
+        if len(data) < size:
             self._done = True
             return
 
@@ -324,3 +324,24 @@ class PlaylistPlayable(BasePlayable, AbstractOpus):
             return self.next_frame()
 
         return frame
+
+
+class MemoryBufferedPlayable(BasePlayable, AbstractOpus):
+    def __init__(self, other, *args, **kwargs):
+        from gevent.queue import Queue
+
+        super(MemoryBufferedPlayable, self).__init__(*args, **kwargs)
+        self.frames = Queue()
+        self.other = other
+        gevent.spawn(self._buffer)
+
+    def _buffer(self):
+        while True:
+            frame = self.other.next_frame()
+            if not frame:
+                break
+            self.frames.put(frame)
+        self.frames.put(None)
+
+    def next_frame(self):
+        return self.frames.get()