Author: duncan
Date: Mon Mar 17 09:39:11 2008
New Revision: 10544

Log:
Removed debug messages that print too frequently


Modified:
   branches/rel-1/freevo/src/plugins/screensaver/__init__.py
   branches/rel-1/freevo/src/plugins/screensaver/balls.py

Modified: branches/rel-1/freevo/src/plugins/screensaver/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/screensaver/__init__.py   (original)
+++ branches/rel-1/freevo/src/plugins/screensaver/__init__.py   Mon Mar 17 
09:39:11 2008
@@ -138,12 +138,9 @@
 
     def stop_saver(self):
         _debug_('stop_saver()', 1)
-        osd.mutex.acquire()
-        try:
-            self.stop_screensaver = True
+        self.stop_screensaver = True
+        if self.thread:
             self.thread.join()
-        finally:
-            osd.mutex.release()
 
 
     def __run__(self):

Modified: branches/rel-1/freevo/src/plugins/screensaver/balls.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/screensaver/balls.py      (original)
+++ branches/rel-1/freevo/src/plugins/screensaver/balls.py      Mon Mar 17 
09:39:11 2008
@@ -81,12 +81,11 @@
 
 
     def draw(self, screen):
-        _debug_('draw(screen=%r)' % (screen,), 1)
         black = (0,0,0)
         dirty = []
         osd.mutex.acquire()
         try:
-            screen.unlock()
+            screen.lock()
             for ball in self.balls:
                 ball.clear(screen, black)
                 dirty.append(ball.rectangle())
@@ -121,19 +120,16 @@
 
 
     def draw(self, screen):
-        _debug_('draw(screen=%r)' % (screen,), 1)
         pygame.draw.ellipse(screen, self.color, (int(self.x), int(self.y), 
self.w, self.h))
         pygame.draw.ellipse(screen, (255,255,255), (int(self.x), int(self.y), 
self.w, self.h), 1)
 
 
     def clear(self, screen, color):
-        _debug_('clear(screen=%r, color=%r)' % (screen, color), 1)
         pygame.draw.ellipse(screen, color, (int(self.x), int(self.y), self.w, 
self.h))
         pygame.draw.ellipse(screen, color, (int(self.x), int(self.y), self.w, 
self.h), 1)
 
 
     def update(self, width, height, walldeccel, floordeccel):
-        _debug_('update(width=%r, height=%r, walldeccel=%r, floordeccel=%r)' % 
(width, height, walldeccel, floordeccel), 1)
         # Update ball velocity
         self.hspeed = self.hspeed + self.haccel
         self.vspeed = self.vspeed + self.vaccel
@@ -187,5 +183,4 @@
 
 
     def rectangle(self):
-        _debug_('rectangle()', 1)
         return (int(self.x), int(self.y), self.w, self.h)

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to