Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5103/src/plugins
Modified Files:
freevoscreensaver.py lcd.py mediamenu.py
Log Message:
remove TRUE, FALSE, DEBUG and HELPER
Index: mediamenu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mediamenu.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** mediamenu.py 8 Jan 2005 11:09:51 -0000 1.45
--- mediamenu.py 8 Jan 2005 15:40:53 -0000 1.46
***************
*** 59,63 ****
the 'video', 'audio', 'image' or 'games' plugin.
"""
! def __init__(self, type=None, force_text_view=FALSE):
plugin.MainMenuPlugin.__init__(self)
self.type = type
--- 59,63 ----
the 'video', 'audio', 'image' or 'games' plugin.
"""
! def __init__(self, type=None, force_text_view=False):
plugin.MainMenuPlugin.__init__(self)
self.type = type
Index: freevoscreensaver.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/freevoscreensaver.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** freevoscreensaver.py 20 Nov 2004 18:23:03 -0000 1.5
--- freevoscreensaver.py 8 Jan 2005 15:40:52 -0000 1.6
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2005/01/08 15:40:52 dischi
+ # remove TRUE, FALSE, DEBUG and HELPER
+ #
# Revision 1.5 2004/11/20 18:23:03 dischi
# use python logger module for debug
***************
*** 59,68 ****
log = logging.getLogger()
- # Set to 1 for debug output
- DEBUG = config.DEBUG
-
- TRUE = 1
- FALSE = 0
-
class PluginInterface(plugin.DaemonPlugin):
"""
--- 62,65 ----
***************
*** 98,105 ****
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'SCREENSAVER'
! self.event_listener = TRUE
! self.poll_menu_only = TRUE
self.last_event = 0
! self.screensaver_showing = FALSE
self.vitem = None
self.pl = None
--- 95,102 ----
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'SCREENSAVER'
! self.event_listener = True
! self.poll_menu_only = True
self.last_event = 0
! self.screensaver_showing = False
self.vitem = None
self.pl = None
***************
*** 126,138 ****
if event.name == 'SCREENSAVER_START':
self.start_saver()
! return FALSE
if event.name == 'SCREENSAVER_STOP' and self.screensaver_showing :
self.stop_saver()
! return FALSE
# gotta ignore these or video screensavers shutoff before they begin
if event.name == 'VIDEO_START' or event.name == 'PLAY_START' or
event.name == 'VIDEO_END' or event.name == 'PLAY_END':
! return FALSE
if self.screensaver_showing :
--- 123,135 ----
if event.name == 'SCREENSAVER_START':
self.start_saver()
! return False
if event.name == 'SCREENSAVER_STOP' and self.screensaver_showing :
self.stop_saver()
! return False
# gotta ignore these or video screensavers shutoff before they begin
if event.name == 'VIDEO_START' or event.name == 'PLAY_START' or
event.name == 'VIDEO_END' or event.name == 'PLAY_END':
! return False
if self.screensaver_showing :
***************
*** 142,146 ****
self.last_event = time.time()
! return FALSE
def poll(self):
--- 139,143 ----
self.last_event = time.time()
! return False
def poll(self):
***************
*** 151,155 ****
def start_saver (self):
log.info("start screensaver")
! self.screensaver_showing = TRUE
if self.saver_type == 'xscreensaver':
os.system('%s -no-splash &' % self.arg1)
--- 148,152 ----
def start_saver (self):
log.info("start screensaver")
! self.screensaver_showing = True
if self.saver_type == 'xscreensaver':
os.system('%s -no-splash &' % self.arg1)
***************
*** 178,182 ****
def stop_saver (self):
log.info("stop screensaver")
! self.screensaver_showing = FALSE
if self.saver_type == 'xscreensaver':
os.system('%s -exit' % self.arg2)
--- 175,179 ----
def stop_saver (self):
log.info("stop screensaver")
! self.screensaver_showing = False
if self.saver_type == 'xscreensaver':
os.system('%s -exit' % self.arg2)
Index: lcd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/lcd.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** lcd.py 27 Nov 2004 19:11:29 -0000 1.22
--- lcd.py 8 Jan 2005 15:40:53 -0000 1.23
***************
*** 14,17 ****
--- 14,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.23 2005/01/08 15:40:53 dischi
+ # remove TRUE, FALSE, DEBUG and HELPER
+ #
# Revision 1.22 2004/11/27 19:11:29 dischi
# fix bad log statement
***************
*** 694,702 ****
return
! if config.DEBUG > 0:
! print String(_( "Connecting to LCD: %s" )) % cm
! print String(_( "Info as know by the LCD module:" ))
! self.lcd.getinfo()
! print ""
self.poll_interval = 10
--- 697,705 ----
return
! # if 1:
! # print String(_( "Connecting to LCD: %s" )) % cm
! # print String(_( "Info as know by the LCD module:" ))
! # self.lcd.getinfo()
! # print ""
self.poll_interval = 10
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
