Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5103/src/tv/plugins
Modified Files:
manual_record.py mplayer.py tvtime.py xawtv.py
Log Message:
remove TRUE, FALSE, DEBUG and HELPER
Index: tvtime.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/tvtime.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** tvtime.py 20 Nov 2004 18:23:04 -0000 1.43
--- tvtime.py 8 Jan 2005 15:40:54 -0000 1.44
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.44 2005/01/08 15:40:54 dischi
+ # remove TRUE, FALSE, DEBUG and HELPER
+ #
# Revision 1.43 2004/11/20 18:23:04 dischi
# use python logger module for debug
***************
*** 87,92 ****
log = logging.getLogger('tv')
- # Set to 1 for debug output
- DEBUG = config.DEBUG
class PluginInterface(plugin.Plugin):
--- 90,93 ----
***************
*** 499,503 ****
mixer.setPcmVolume(mixer_vol)
! if DEBUG: print '%s: started %s app' % (time.time(), self.mode)
--- 500,504 ----
mixer.setPcmVolume(mixer_vol)
! log.info('%s: started %s app' % (time.time(), self.mode))
***************
*** 537,541 ****
# self.Stop(channel_change=1)
# self.Play('tv', nextchan)
! # return TRUE
self.fc.chanSet(nextchan, app=self.app)
--- 538,542 ----
# self.Stop(channel_change=1)
# self.Play('tv', nextchan)
! # return True
self.fc.chanSet(nextchan, app=self.app)
***************
*** 606,615 ****
's' : em.STOP }
! if DEBUG: print 'TVTIME 1 KEY EVENT: "%s"' % str(list(line))
if line == 'F10':
! if DEBUG: print 'TVTIME screenshot!'
self.write('screenshot\n')
elif line == 'z':
! if DEBUG: print 'TVTIME fullscreen toggle!'
self.write('toggle_fullscreen\n')
# FIXME: osd is gone now
--- 607,616 ----
's' : em.STOP }
! log.info('TVTIME 1 KEY EVENT: "%s"' % str(list(line)))
if line == 'F10':
! log.info('TVTIME screenshot!')
self.write('screenshot\n')
elif line == 'z':
! log.info('TVTIME fullscreen toggle!')
self.write('toggle_fullscreen\n')
# FIXME: osd is gone now
***************
*** 619,624 ****
if event is not None:
eventhandler.post(event)
! if DEBUG: print 'posted translated tvtime event "%s"' % event
else:
! if DEBUG: print 'tvtime cmd "%s" not found!' % line
--- 620,625 ----
if event is not None:
eventhandler.post(event)
! log.info('posted translated tvtime event "%s"' % event)
else:
! log.info('tvtime cmd "%s" not found!' % line)
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** mplayer.py 28 Oct 2004 19:43:52 -0000 1.44
--- mplayer.py 8 Jan 2005 15:40:54 -0000 1.45
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.45 2005/01/08 15:40:54 dischi
+ # remove TRUE, FALSE, DEBUG and HELPER
+ #
# Revision 1.44 2004/10/28 19:43:52 dischi
# remove broken imports
***************
*** 70,79 ****
from tv.player import TVPlayer
- # Set to 1 for debug output
- DEBUG = config.DEBUG
-
- TRUE = 1
- FALSE = 0
-
class PluginInterface(plugin.Plugin):
--- 73,76 ----
***************
*** 208,213 ****
mixer.setPcmVolume(mixer_vol)
- if DEBUG: print '%s: started %s app' % (time.time(), self.mode)
-
--- 205,208 ----
***************
*** 235,239 ****
self.Stop()
eventhandler.post(em.PLAY_END)
! return TRUE
elif event in [ em.TV_CHANNEL_UP, em.TV_CHANNEL_DOWN] or
s_event.startswith('INPUT_'):
--- 230,234 ----
self.Stop()
eventhandler.post(em.PLAY_END)
! return True
elif event in [ em.TV_CHANNEL_UP, em.TV_CHANNEL_DOWN] or
s_event.startswith('INPUT_'):
***************
*** 251,263 ****
self.Stop(channel_change=1)
self.Play('tv', nextchan)
! return TRUE
if self.mode == 'vcr':
! return
elif self.current_vg.group_type == 'dvb':
self.Stop(channel_change=1)
self.Play('tv', nextchan)
! return TRUE
elif self.current_vg.group_type == 'ivtv':
--- 246,258 ----
self.Stop(channel_change=1)
self.Play('tv', nextchan)
! return True
if self.mode == 'vcr':
! return True
elif self.current_vg.group_type == 'dvb':
self.Stop(channel_change=1)
self.Play('tv', nextchan)
! return True
elif self.current_vg.group_type == 'ivtv':
***************
*** 278,282 ****
cmd = 'osd_show_text "%s"\n' % msg
self.app.write(cmd)
! return TRUE
elif event == em.TOGGLE_OSD:
--- 273,277 ----
cmd = 'osd_show_text "%s"\n' % msg
self.app.write(cmd)
! return True
elif event == em.TOGGLE_OSD:
***************
*** 287,292 ****
cmd = 'osd_show_text "%s"\n' % msg
self.app.write(cmd)
! return FALSE
! return FALSE
--- 282,287 ----
cmd = 'osd_show_text "%s"\n' % msg
self.app.write(cmd)
! return True
! return False
Index: xawtv.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/xawtv.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** xawtv.py 20 Nov 2004 18:23:04 -0000 1.9
--- xawtv.py 8 Jan 2005 15:40:54 -0000 1.10
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.10 2005/01/08 15:40:54 dischi
+ # remove TRUE, FALSE, DEBUG and HELPER
+ #
# Revision 1.9 2004/11/20 18:23:04 dischi
# use python logger module for debug
***************
*** 72,78 ****
log = logging.getLogger('tv')
- # Set to 1 for debug output
- DEBUG = config.DEBUG
-
class PluginInterface(plugin.Plugin):
"""
--- 75,78 ----
***************
*** 235,239 ****
mixer.setPcmVolume(mixer_vol)
! if DEBUG: print '%s: started %s app' % (time.time(), self.mode)
--- 235,239 ----
mixer.setPcmVolume(mixer_vol)
! log.info('%s: started %s app' % (time.time(), self.mode))
Index: manual_record.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/manual_record.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** manual_record.py 8 Jan 2005 10:27:17 -0000 1.11
--- manual_record.py 8 Jan 2005 15:40:53 -0000 1.12
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2005/01/08 15:40:53 dischi
+ # remove TRUE, FALSE, DEBUG and HELPER
+ #
# Revision 1.11 2005/01/08 10:27:17 dischi
# remove unneeded skin_type parameter
***************
*** 87,91 ****
import _strptime as strptime
- DEBUG = config.DEBUG
--- 90,93 ----
-------------------------------------------------------
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
