From 879011f6f07df0af4ba0e59a610e32c8abed81fc Mon Sep 17 00:00:00 2001
From: andrei <b1naryth1ef@gmail.com>
Date: Tue, 4 Apr 2017 10:06:35 -0700
Subject: [PATCH] Cleanup

---
 disco/voice/client.py | 44 ++++++++++++++++++++++++++-----------------
 disco/voice/player.py |  7 ++++---
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/disco/voice/client.py b/disco/voice/client.py
index 327c4cd..dd50cbb 100644
--- a/disco/voice/client.py
+++ b/disco/voice/client.py
@@ -33,20 +33,28 @@ class UDPVoiceClient(LoggingClass):
     def __init__(self, vc):
         super(UDPVoiceClient, self).__init__()
         self.vc = vc
+
+        # The underlying UDP socket
         self.conn = None
+
+        # Connection information
         self.ip = None
         self.port = None
+        self.sequence = 0
+        self.timestamp = 0
+
         self.run_task = None
         self.connected = False
 
-    def send_frame(self, frame, sequence, timestamp):
+    def send_frame(self, frame, sequence=None, timestamp=None):
         data = bytearray(12)
         data[0] = 0x80
         data[1] = 0x78
-        struct.pack_into('>H', data, 2, sequence)
-        struct.pack_into('>I', data, 4, timestamp)
+        struct.pack_into('>H', data, 2, sequence or self.sequence)
+        struct.pack_into('>I', data, 4, timestamp or self.timestamp)
         struct.pack_into('>i', data, 8, self.vc.ssrc)
         self.send(data + ''.join(frame))
+        self.sequence += 1
 
     def run(self):
         while True:
@@ -58,26 +66,29 @@ class UDPVoiceClient(LoggingClass):
     def disconnect(self):
         self.run_task.kill()
 
-    def connect(self, host, port, timeout=10):
+    def connect(self, host, port, timeout=10, addrinfo=None):
         self.ip = socket.gethostbyname(host)
         self.port = port
 
         self.conn = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
-        # Send discovery packet
-        packet = bytearray(70)
-        struct.pack_into('>I', packet, 0, self.vc.ssrc)
-        self.send(packet)
+        if addrinfo:
+            ip, port = addrinfo
+        else:
+            # Send discovery packet
+            packet = bytearray(70)
+            struct.pack_into('>I', packet, 0, self.vc.ssrc)
+            self.send(packet)
 
-        # Wait for a response
-        try:
-            data, addr = gevent.spawn(lambda: self.conn.recvfrom(70)).get(timeout=timeout)
-        except gevent.Timeout:
-            return (None, None)
+            # Wait for a response
+            try:
+                data, addr = gevent.spawn(lambda: self.conn.recvfrom(70)).get(timeout=timeout)
+            except gevent.Timeout:
+                return (None, None)
 
-        # Read IP and port
-        ip = str(data[4:]).split('\x00', 1)[0]
-        port = struct.unpack('<H', data[-2:])[0]
+            # Read IP and port
+            ip = str(data[4:]).split('\x00', 1)[0]
+            port = struct.unpack('<H', data[-2:])[0]
 
         # Spawn read thread so we don't max buffers
         self.connected = True
@@ -205,7 +216,6 @@ class VoiceClient(LoggingClass):
         })
 
     def on_close(self, code, error):
-        # TODO
         self.log.warning('Voice websocket disconnected (%s, %s)', code, error)
 
         if self.state == VoiceState.CONNECTED:
diff --git a/disco/voice/player.py b/disco/voice/player.py
index 516954f..67e957e 100644
--- a/disco/voice/player.py
+++ b/disco/voice/player.py
@@ -180,10 +180,10 @@ class Player(object):
     def play(self, item):
         start = time.time()
         loops = 0
-        timestamp = 0
 
         while True:
             loops += 1
+
             if self.paused:
                 self.client.set_speaking(False)
                 self.paused.wait()
@@ -199,8 +199,9 @@ class Player(object):
             if not item.have_frame():
                 return
 
-            self.client.send_frame(item.next_frame(), loops, timestamp)
-            timestamp += item.samples_per_frame
+            self.client.send_frame(item.next_frame())
+            self.client.timestamp += item.samples_per_frame
+
             next_time = start + 0.02 * loops
             delay = max(0, 0.02 + (next_time - time.time()))
             gevent.sleep(delay)