Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv13506/plugins
Modified Files:
base.py commands.py file_ops.py headlines.py icecast.py
idlebar.py joy.py lcd.py mediamenu.py mixer.py ossmixer.py
rom_drives.py usb.py
Log Message:
removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
Index: base.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/base.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** base.py 13 Sep 2003 10:08:22 -0000 1.5
--- base.py 14 Sep 2003 20:09:36 -0000 1.6
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.5 2003/09/13 10:08:22 dischi
# i18n support
***************
*** 54,62 ****
from item import Item
-
-
- TRUE = 1
- FALSE = 0
-
class ShutdownItem(Item):
--- 57,60 ----
Index: commands.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/commands.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** commands.py 13 Sep 2003 10:08:22 -0000 1.4
--- commands.py 14 Sep 2003 20:09:36 -0000 1.5
***************
*** 15,18 ****
--- 15,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.4 2003/09/13 10:08:22 dischi
# i18n support
***************
*** 70,76 ****
skin = skin.get_singleton()
menuwidget = menu.get_singleton()
-
- TRUE = 1
- FALSE = 0
class LogScroll(PopupBox):
--- 73,76 ----
Index: file_ops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/file_ops.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** file_ops.py 3 Sep 2003 18:03:06 -0000 1.3
--- file_ops.py 14 Sep 2003 20:09:36 -0000 1.4
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.3 2003/09/03 18:03:06 dischi
# fix crash in DEBUG
***************
*** 49,55 ****
from gui.ConfirmBox import ConfirmBox
- TRUE = 1
- FALSE = 0
-
class PluginInterface(plugin.ItemPlugin):
"""
--- 52,55 ----
***************
*** 80,85 ****
def delete_file(self):
! if config.DEBUG:
! print 'Deleting %s' % self.item.filename
if self.item.type in ('video', 'audio'):
--- 80,84 ----
def delete_file(self):
! _debug_('Deleting %s' % self.item.filename)
if self.item.type in ('video', 'audio'):
Index: headlines.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/headlines.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** headlines.py 14 Sep 2003 11:12:47 -0000 1.4
--- headlines.py 14 Sep 2003 20:09:36 -0000 1.5
***************
*** 16,19 ****
--- 16,22 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.4 2003/09/14 11:12:47 dischi
# Show details when selecting the item. The cache dir is now a subdir of
***************
*** 69,75 ****
skin = skin.get_singleton()
osd = osd.get_singleton()
-
- TRUE = 1
- FALSE = 0
#check every 30 minutes
--- 72,75 ----
Index: icecast.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/icecast.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** icecast.py 5 Sep 2003 02:36:12 -0000 1.7
--- icecast.py 14 Sep 2003 20:09:36 -0000 1.8
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.7 2003/09/05 02:36:12 mikeruelle
# load the item plugin automatically so we can change the playlist from inside freevo
***************
*** 52,59 ****
import plugin
-
- TRUE = 1
- FALSE = 0
-
class PluginInterface(plugin.DaemonPlugin):
--- 55,58 ----
Index: idlebar.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/idlebar.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** idlebar.py 12 Sep 2003 20:32:49 -0000 1.39
--- idlebar.py 14 Sep 2003 20:09:36 -0000 1.40
***************
*** 42,45 ****
--- 42,48 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.40 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.39 2003/09/12 20:32:49 dischi
# move holiday settings into the plugin
***************
*** 106,115 ****
import re
- DEBUG = config.DEBUG
-
- TRUE = 1
- FALSE = 0
-
-
class PluginInterface(plugin.DaemonPlugin):
"""
--- 109,112 ----
***************
*** 292,298 ****
if now > self.next_guide_check:
! if DEBUG: print 'TV: checking guide'
self.listings_expire = tv_util.when_listings_expire()
! if DEBUG: print 'TV: listings expire in %s hours' %
self.listings_expire
# check again in 10 minutes
self.next_guide_check = now + 10*60
--- 289,295 ----
if now > self.next_guide_check:
! _debug_('TV: checking guide')
self.listings_expire = tv_util.when_listings_expire()
! _debug_('TV: listings expire in %s hours' % self.listings_expire)
# check again in 10 minutes
self.next_guide_check = now + 10*60
Index: joy.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/joy.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** joy.py 23 Aug 2003 12:51:42 -0000 1.8
--- joy.py 14 Sep 2003 20:09:36 -0000 1.9
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.9 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.8 2003/08/23 12:51:42 dischi
# removed some old CVS log messages
***************
*** 51,60 ****
rc = rc.get_singleton()
- DEBUG = 0
-
- TRUE = 1
- FALSE = 0
-
-
class PluginInterface(plugin.DaemonPlugin):
--- 54,57 ----
***************
*** 99,105 ****
def poll(self):
command = ''
! if DEBUG > 5: print 'self.joyfd = %s' % self.joyfd
(r, w, e) = select.select([self.joyfd], [], [], 0)
! if DEBUG > 5: print 'r,w,e = %s,%s,%s' % (r,w,e)
if r:
--- 96,102 ----
def poll(self):
command = ''
! _debug_('self.joyfd = %s' % self.joyfd, level=3)
(r, w, e) = select.select([self.joyfd], [], [], 0)
! _debug_('r,w,e = %s,%s,%s' % (r,w,e), level=3)
if r:
***************
*** 127,131 ****
command = config.JOY_CMDS['right']
if command != '':
! if DEBUG: print 'Translation: "%s" -> "%s"' % (button, command)
command = rc.key_event_mapper(command)
if command:
--- 124,128 ----
command = config.JOY_CMDS['right']
if command != '':
! _debug_('Translation: "%s" -> "%s"' % (button, command))
command = rc.key_event_mapper(command)
if command:
Index: lcd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/lcd.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** lcd.py 1 Sep 2003 20:35:28 -0000 1.9
--- lcd.py 14 Sep 2003 20:09:36 -0000 1.10
***************
*** 14,17 ****
--- 14,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.10 2003/09/14 20:09:36 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.9 2003/09/01 20:35:28 gsbarbieri
# Video Player support
***************
*** 77,82 ****
import config
- DEBUG=config.DEBUG
-
# Configuration: (Should move to freevo_conf.py?)
sep_str = " | " # use as separator between two strings. Like: "Length:
123<sep_str>Plot: ..."
--- 80,83 ----
***************
*** 670,674 ****
return
! if DEBUG > 0:
print "Connecting to LCD: %s" % cm
print "Info as know by the module:"
--- 671,675 ----
return
! if config.DEBUG > 0:
print "Connecting to LCD: %s" % cm
print "Info as know by the module:"
***************
*** 860,865 ****
screens = layouts[ l ]
except KeyError:
! if DEBUG > 0:
! print "WARNING: Could not find screens for %d lines LCD!" % l
l -= 1
if l < 1:
--- 861,865 ----
screens = layouts[ l ]
except KeyError:
! _debug_("WARNING: Could not find screens for %d lines LCD!" % l)
l -= 1
if l < 1:
***************
*** 872,877 ****
screens = layouts[ l ][ c ]
except KeyError:
! if DEBUG > 0:
! print "WARNING: Could not find screens for %d lines and %d
columns LCD!" % ( l, c )
c -= 1
if c < 1:
--- 872,877 ----
screens = layouts[ l ][ c ]
except KeyError:
! _debug_("WARNING: Could not find screens for %d lines and %d "\
! "columns LCD!" % ( l, c ))
c -= 1
if c < 1:
***************
*** 886,891 ****
self.screens = screens = layouts[ l ][ c ]
except KeyError:
! if DEBUG > 0:
! print "WARNING: Could not find screens for %d lines and %d columns
LCD!" % ( self.height, self.width )
print "ERROR: No screens found!"
self.disable = 1
--- 886,891 ----
self.screens = screens = layouts[ l ][ c ]
except KeyError:
! _debug_("WARNING: Could not find screens for %d lines"\
! " and %d columns LCD!" % ( self.height, self.width ))
print "ERROR: No screens found!"
self.disable = 1
Index: mediamenu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mediamenu.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mediamenu.py 5 Sep 2003 16:11:45 -0000 1.19
--- mediamenu.py 14 Sep 2003 20:09:37 -0000 1.20
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.20 2003/09/14 20:09:37 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.19 2003/09/05 16:11:45 mikeruelle
# allow games to get its additional args
***************
*** 79,85 ****
from item import Item
from directory import DirItem
-
- TRUE = 1
- FALSE = 0
import plugin
--- 82,85 ----
Index: mixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mixer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mixer.py 23 Aug 2003 12:51:42 -0000 1.5
--- mixer.py 14 Sep 2003 20:09:37 -0000 1.6
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/09/14 20:09:37 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.5 2003/08/23 12:51:42 dischi
# removed some old CVS log messages
***************
*** 46,54 ****
import event as em
- # Set to 1 for debug output
- DEBUG = config.DEBUG
-
- TRUE = 1
- FALSE = 0
class PluginInterface(plugin.DaemonPlugin):
--- 49,52 ----
***************
*** 106,110 ****
self.setOgainVolume(config.MAX_VOLUME)
else:
! if DEBUG: print "No appropriate audio channel found for mixer"
if config.CONTROL_ALL_AUDIO:
--- 104,108 ----
self.setOgainVolume(config.MAX_VOLUME)
else:
! _debug_("No appropriate audio channel found for mixer")
if config.CONTROL_ALL_AUDIO:
***************
*** 146,150 ****
def _setVolume(self, device, volume):
if self.mixfd:
! if DEBUG: print 'Volume = %d' % volume
if volume < 0: volume = 0
if volume > 100: volume = 100
--- 144,148 ----
def _setVolume(self, device, volume):
if self.mixfd:
! _debug_('Volume = %d' % volume)
if volume < 0: volume = 0
if volume > 100: volume = 100
Index: ossmixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/ossmixer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ossmixer.py 26 Aug 2003 19:46:47 -0000 1.2
--- ossmixer.py 14 Sep 2003 20:09:37 -0000 1.3
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2003/09/14 20:09:37 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.2 2003/08/26 19:46:47 outlyer
# Should be working now; does not require aumix for SBLive control, and
***************
*** 64,72 ****
import ossaudiodev
- # Set to 1 for debug output
- DEBUG = config.DEBUG
-
- TRUE = 1
- FALSE = 0
class PluginInterface(plugin.DaemonPlugin):
--- 67,70 ----
***************
*** 108,112 ****
self.setOgainVolume(config.MAX_VOLUME)
else:
! if DEBUG: print "No appropriate audio channel found for mixer"
if config.CONTROL_ALL_AUDIO:
--- 106,110 ----
self.setOgainVolume(config.MAX_VOLUME)
else:
! _debug_("No appropriate audio channel found for mixer")
if config.CONTROL_ALL_AUDIO:
***************
*** 147,152 ****
def _setVolume(self, device, volume):
! if self.mixfd and (self.mixfd.controls() & (1 << device)): # Don't do
anything if there is no control
! if DEBUG: print 'Volume = %d' % volume
if volume < 0: volume = 0
if volume > 100: volume = 100
--- 145,151 ----
def _setVolume(self, device, volume):
! if self.mixfd and (self.mixfd.controls() & (1 << device)):
! # Don't do anything if there is no control
! _debug_('Volume = %d' % volume)
if volume < 0: volume = 0
if volume > 100: volume = 100
Index: rom_drives.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** rom_drives.py 13 Sep 2003 10:08:22 -0000 1.28
--- rom_drives.py 14 Sep 2003 20:09:37 -0000 1.29
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.29 2003/09/14 20:09:37 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.28 2003/09/13 10:08:22 dischi
# i18n support
***************
*** 91,97 ****
from item import Item
- TRUE = 1
- FALSE = 0
-
import mmpython
--- 94,97 ----
***************
*** 100,105 ****
from directory import DirItem
- DEBUG = config.DEBUG # 1 = regular debug, 2 = more verbose
-
LABEL_REGEXP = re.compile("^(.*[^ ]) *$").match
--- 100,103 ----
***************
*** 286,291 ****
if dir == 'open':
! if DEBUG:
! print 'Ejecting disc in drive %s' % self.drivename
if notify:
--- 284,288 ----
if dir == 'open':
! _debug_('Ejecting disc in drive %s' % self.drivename)
if notify:
***************
*** 315,320 ****
elif dir == 'close':
! if DEBUG:
! print 'Inserting %s' % self.drivename
if notify:
--- 312,316 ----
elif dir == 'close':
! _debug_('Inserting %s' % self.drivename)
if notify:
***************
*** 352,356 ****
"""
! if DEBUG: print 'Mounting disc in drive %s' % self.drivename
util.mount(self.mountdir, force=TRUE)
return
--- 348,352 ----
"""
! _debug_('Mounting disc in drive %s' % self.drivename)
util.mount(self.mountdir, force=TRUE)
return
***************
*** 361,365 ****
"""
! if DEBUG: print 'Unmounting disc in drive %s' % self.drivename
util.umount(self.mountdir)
return
--- 357,361 ----
"""
! _debug_('Unmounting disc in drive %s' % self.drivename)
util.umount(self.mountdir)
return
***************
*** 556,563 ****
! if DEBUG > 2:
! print 'identifymedia: mplayer = "%s"' % mplayer_files
! print 'identifymedia: mp3="%s"' % mp3_files
! print 'identifymedia: image="%s"' % image_files
media.info = DirItem(media.mountdir, None)
--- 552,558 ----
! _debug_('identifymedia: mplayer = "%s"' % mplayer_files, level = 2)
! _debug_('identifymedia: mp3="%s"' % mp3_files, level = 2)
! _debug_('identifymedia: image="%s"' % image_files, level = 2)
media.info = DirItem(media.mountdir, None)
***************
*** 691,703 ****
if last_status != media.drive_status:
! if DEBUG:
! print 'MEDIA: Status=%s' % media.drive_status
! print 'Posting IDENTIFY_MEDIA event'
if last_status:
self.last_media = media
rc.post_event(plugin.event('IDENTIFY_MEDIA'))
else:
! if DEBUG > 1:
! print 'MEDIA: Status=%s' % media.drive_status
self.lock.release()
--- 686,696 ----
if last_status != media.drive_status:
! _debug_('MEDIA: Status=%s' % media.drive_status)
! _debug_('Posting IDENTIFY_MEDIA event')
if last_status:
self.last_media = media
rc.post_event(plugin.event('IDENTIFY_MEDIA'))
else:
! _debug_('MEDIA: Status=%s' % media.drive_status)
self.lock.release()
Index: usb.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/usb.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** usb.py 23 Aug 2003 12:51:42 -0000 1.3
--- usb.py 14 Sep 2003 20:09:37 -0000 1.4
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2003/09/14 20:09:37 dischi
+ # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
+ #
# Revision 1.3 2003/08/23 12:51:42 dischi
# removed some old CVS log messages
***************
*** 40,46 ****
import util
import rc
-
- TRUE = 1
- FALSE = 0
class PluginInterface(plugin.DaemonPlugin):
--- 43,46 ----
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
