Merge pull request #7 from CodePanter/master

Changed a few small things to improve ease of use.

vloed.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 """This is a udp / binary version of PixelFlut
 
-Inspired by the PixelFlut beamer on eth0:winter 2016 and
+Inspired by the PixelFlut projector on eth0:winter 2016 and
 code from https://github.com/defnull/pixelflut/
 """
 
@@ -107,7 +107,7 @@ class Canvas(object):
   def Draw(self):
     """Draws pixels specified in the received packages in the queue"""
     if self.queue.empty():
-      # indicat that nothing was done, and w can skip flipping the screen
+      # indicate that nothing was done, and we can skip flipping the screen
       return False
     #access the pixel array and lock it
     self.pixels = pygame.surfarray.pixels2d(self.screen)
@@ -145,13 +145,17 @@ class Canvas(object):
 
   def SendDiscoveryPacket(self):
     """Lets send out our ip/port/resolution to any listening clients"""
-    self.broadcastsocket.sendto(
-        '%s:%f %s:%d %d*%d' % (PROTOCOL_PREAMBLE, PROTOCOL_VERSION,
-                               UDP_IP, UDP_PORT,
-                               self.width, self.height),
-        ('<broadcast>', DISCOVER_PORT))
-    if self.debug:
-      print 'sending discovery packet'
+    try:
+      self.broadcastsocket.sendto(
+          '%s:%f %s:%d %d*%d' % (PROTOCOL_PREAMBLE, PROTOCOL_VERSION,
+                                 UDP_IP, UDP_PORT,
+                                 self.width, self.height),
+          ('<broadcast>', DISCOVER_PORT))
+      if self.debug:
+        print 'sending discovery packet'
+    except Exception as error:
+      if self.debug:
+        print error
 
   def __del__(self):
     """Clean up any sockets we created"""
@@ -204,7 +208,7 @@ class PixelVloedClient(object):
             servers[0])
     else:
       self.ipaddress = ip
-      self.port = port
+      self.port = port if port else UDP_IP
       self.width = width
       self.height = height
       if self.debug:
@@ -230,7 +234,7 @@ class PixelVloedClient(object):
 
   @staticmethod
   def DiscoverServers(returnfirst=False, timeout=5):
-    """Discover servers that send out the pixelfvloed preample"""
+    """Discover servers that send out the pixelvloed preample"""
     discoverysock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     discoverysock.bind(('', DISCOVER_PORT))
     starttime = time.time()
@@ -296,9 +300,9 @@ class MaxSizeList(list):
 
   def append(self, item):
     """Appends an item to the list"""
-    super(MaxSizeList, self).append(item)
     if self.__len__() == self.maxsize:
       raise IndexError('max size reached')
+    super(MaxSizeList, self).append(item)
 
 def RunServer():
   """Runs a pixelvloed server"""