diff --git a/client.py b/client.py index 611289c..917f351 100755 --- a/client.py +++ b/client.py @@ -17,7 +17,6 @@ import random import time class MaxSizeList(list): - maxsize = 0 def __init__(self, maxcount=100): self.maxsize = maxcount @@ -28,7 +27,6 @@ class MaxSizeList(list): if self.__len__() == self.maxsize: raise IndexError('max size reached') - def RGBPixel(x, y, r, g, b, a=None): # pylint: disable=C0103 """Generates the packed data for a pixel""" if a: @@ -58,7 +56,7 @@ def RandomFill(width=640, height=480): message.append(pixel) except IndexError: yield ''.join(message) - message[:] = [] + message[2:] = [] message.append(pixel) yield ''.join(message) diff --git a/vloed.py b/vloed.py index 070ddb0..f587e56 100755 --- a/vloed.py +++ b/vloed.py @@ -39,7 +39,7 @@ class Canvas(object): self.udp_port = UDP_PORT self.width = width self.height = height - self.canvas() + self.canvas() self.set_title() self.queue = queue self.limit = 140 @@ -98,31 +98,36 @@ class Canvas(object): # indicat that nothing was done, and w can skip flipping the screen return False #access the pixel array and lock it - self.pixels = pygame.surfarray.pixels2d(self.screen) + self.pixels = pygame.surfarray.pixels2d(self.screen) returntime = time.time() + (1.0 / self.fps) - # while we have stuff in the queue, and its not our next time to draw a + # while we have stuff in the queue, and its not our next time to draw a # frame, lets process packets from the queue while time.time() < returntime and not self.queue.empty(): - data = self.queue.get() - preamble = struct.unpack_from("