Author: duncan
Date: Thu Feb 8 20:35:29 2007
New Revision: 9181
Modified:
branches/rel-1/freevo/src/plugins/screensaver/__init__.py
branches/rel-1/freevo/src/plugins/screensaver/balls.py
branches/rel-1/freevo/src/plugins/screensaver/bouncing_freevo.py
Log:
[ 1655456 ] Redraw problems between screensaver and exiting screensaver
Patch from Adam Charrett applied
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 Thu Feb 8
20:35:29 2007
@@ -129,13 +129,20 @@
def __run__(self):
_debug_('Screensaver thread started')
current_saver = None
+ index = 0
+ plugins_count = len(self.plugins)
while not self.stop_screensaver:
# No current screensaver so select one of the installed screensaver
# plugins at random
if current_saver is None:
- if len(self.plugins) == 1:
+ if plugins_count == 1:
current_saver = self.plugins[0]
- elif len(self.plugins) > 1:
+ elif plugins_count > 1 and plugins_count <= 4:
+ current_saver = self.plugins[index]
+ index += 1
+ if index > plugins_count:
+ index = 0
+ elif plugins_count > 4:
index = random.randint(0, len(self.plugins) - 1)
current_saver = self.plugins[index]
@@ -148,6 +155,7 @@
self.screensaver_showing = False
skin.force_redraw = True
skin.redraw()
+ osd.update()
_debug_('Screensaver thread stopped')
def __run_screensaver__(self, screensaver):
@@ -175,8 +183,8 @@
self.plugins.remove(screensaver)
osd.clearscreen(osd.COL_BLACK)
- pygame.display.flip()
-
+ osd.update()
+
class ScreenSaverPlugin(plugin.Plugin):
@@ -191,7 +199,7 @@
Returns the number of frames per second the saver
wants to run at.
"""
- return 50
+ return 25
def stop(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 Thu Feb 8
20:35:29 2007
@@ -45,7 +45,7 @@
self.fps = config.BALLS_FPS
def config(self):
- return [ ('BALLS_FPS', 15, 'Frames per second'),
+ return [ ('BALLS_FPS', 25, 'Frames per second'),
('BALLS_MAX_BALLS', 100, 'Maximum number of balls'),
('BALLS_MIN_BALLS', 1, 'Minimum number of balls')]
Modified: branches/rel-1/freevo/src/plugins/screensaver/bouncing_freevo.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/screensaver/bouncing_freevo.py
(original)
+++ branches/rel-1/freevo/src/plugins/screensaver/bouncing_freevo.py Thu Feb
8 20:35:29 2007
@@ -51,7 +51,7 @@
def config(self):
- return [ ('BOUNCING_FREEVO_FPS', 10, 'Frames per second')]
+ return [ ('BOUNCING_FREEVO_FPS', 25, 'Frames per second')]
def start(self, width, height):
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
