Author: duncan
Date: Thu Dec 13 15:34:55 2007
New Revision: 10205
Log:
Cleaned up debug statements
Modified:
branches/rel-1/freevo/src/playlist.py
branches/rel-1/freevo/src/plugins/freevoscreensaver.py
branches/rel-1/freevo/src/plugins/screensaver/__init__.py
Modified: branches/rel-1/freevo/src/playlist.py
==============================================================================
--- branches/rel-1/freevo/src/playlist.py (original)
+++ branches/rel-1/freevo/src/playlist.py Thu Dec 13 15:34:55 2007
@@ -330,6 +330,7 @@
"""
play the playlist
"""
+ _debug_('play(arg=%r, menuw=%r)' % (arg, menuw), 2)
if not self.menuw:
self.menuw = menuw
Modified: branches/rel-1/freevo/src/plugins/freevoscreensaver.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/freevoscreensaver.py (original)
+++ branches/rel-1/freevo/src/plugins/freevoscreensaver.py Thu Dec 13
15:34:55 2007
@@ -102,7 +102,7 @@
eventhandler to handle the events. Always return false since we
are just a listener and really can't send back true.
"""
- _debug_("Saver saw %s" % event.name)
+ _debug_('Saver saw %s' % (event.name), 2)
if menuw:
self.menuw = menuw
@@ -128,12 +128,12 @@
return FALSE
def poll(self):
- _debug_("Saver got polled %f" % time.time())
+ _debug_('Saver got polled %f' % time.time())
if not self.screensaver_showing and (time.time() - self.last_event) >
self.saver_delay :
- rc.post_event(em.Event("SCREENSAVER_START"))
+ rc.post_event(em.Event('SCREENSAVER_START'))
def start_saver (self):
- _debug_("start screensaver")
+ _debug_('start screensaver')
self.screensaver_showing = TRUE
if self.saver_type == 'xscreensaver':
os.system('%s -no-splash &' % self.arg1)
@@ -154,13 +154,13 @@
arg = '-nosound -loop 0'
self.pl.play(arg=arg, menuw=self.menuw)
else:
- _debug_("saver thinks fxd blew up trying to parse?")
+ _debug_('saver thinks fxd blew up trying to parse?')
else:
- _debug_("Unknown saver type to start.")
+ _debug_('Unknown saver type to start.')
- def stop_saver (self):
- _debug_("stop screensaver")
+ def stop_saver(self):
+ _debug_('stop screensaver')
self.screensaver_showing = FALSE
if self.saver_type == 'xscreensaver':
os.system('%s -exit' % self.arg2)
@@ -171,7 +171,7 @@
elif self.saver_type == 'fxd':
rc.post_event(em.STOP)
else:
- _debug_("Unknown saver type to stop.")
+ _debug_('Unknown saver type to stop.')
time.sleep(1)
self.osd.update()
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 Dec 13
15:34:55 2007
@@ -70,16 +70,17 @@
def config(self):
- return [ ('SCREENSAVER_DELAY', 300, '# of seconds to wait to start
saver.'),
- ('SCREENSAVER_CYCLE_TIME', 60, '# of seconds to run a
screensaver before starting another saver.')
- ]
+ return [
+ ('SCREENSAVER_DELAY', 300, '# of seconds to wait to start saver.'),
+ ('SCREENSAVER_CYCLE_TIME', 60, '# of seconds to run a screensaver
before starting another saver.')
+ ]
def eventhandler(self, event = None, menuw=None, arg=None):
"""
eventhandler to handle the events. Always return False since we
are just a listener and really can't send back True.
"""
- _debug_("Saver saw %s" % event.name)
+ _debug_("Saver saw %s" % (event.name), 2)
if menuw:
self.menuw = menuw
@@ -112,19 +113,19 @@
if not self.screensaver_showing and time_diff > self.start_delay :
rc.post_event(Event("SCREENSAVER_START"))
- def start_saver (self):
+ def start_saver(self):
_debug_("start screensaver")
self.screensaver_showing = True
if self.plugins is None:
self.plugins = plugin.get('screensaver')
- _debug_('Plugins =', self.plugins)
+ _debug_('plugins=%r' % (self.plugins))
skin.clear()
# Start Screensaver thread
self.stop_screensaver = False
- self.thread = threading.Thread(target =self.__run__)
+ self.thread = threading.Thread(target=self.__run__)
self.thread.start()
- def stop_saver (self):
+ def stop_saver(self):
_debug_("stop screensaver")
self.stop_screensaver = True
self.thread.join()
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
