Merge branch 'master' of github.com:JanKlopper/pixelvloed

Conflicts:
	vloed.py

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)
 

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("<?", data)[0]
-      protocol = struct.unpack_from("<B", data, 1)[0]
-      packetformat = ("<2H4B" if preamble else "<2H3B")
-      pixellength = (8 #xx,yy,r,g,b,a 
-                     if preamble else 
-                     7 #xx,yy,r,g,b
-                     )
-      pixelcount = min(((len(data)-1) / pixellength),
-                       self.limit)
-      if self.debug:
-        print '%d pixels received, protocol V %d ' % (pixelcount, protocol)
-      for i in xrange(0, pixelcount):
-        pixel = struct.unpack_from(
-            packetformat,
-            data,
-            self.pixeloffset + (i*pixellength))
+      try:
+        data = self.queue.get()
+        preamble = struct.unpack_from("<?", data)[0]
+        protocol = struct.unpack_from("<B", data, 1)[0]
+        packetformat = ("<2H4B" if preamble else "<2H3B")
+        pixellength = (8 #xx,yy,r,g,b,a
+                       if preamble else
+                       7 #xx,yy,r,g,b
+                       )
+        pixelcount = min(((len(data)-1) / pixellength),
+                         self.limit)
         if self.debug:
-          print pixel
-        self.Pixel(*pixel)
+          print '%d pixels received, protocol V %d ' % (pixelcount, protocol)
+        for i in xrange(0, pixelcount):
+          pixel = struct.unpack_from(
+              packetformat,
+              data,
+              self.pixeloffset + (i*pixellength))
+          if self.debug:
+            print pixel
+          self.Pixel(*pixel)
+      except Exception as e:
+        if self.debug:
+          # All exceptions will be printed, but won't result in a crash.
+          print e
     # indicate that we have been drawing stuff
     return True