Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14152
Modified Files:
main.py menu.py osd.py
Log Message:
OVERLAY_DIR is always used
Index: main.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** main.py 1 Jan 2004 12:27:38 -0000 1.101
--- main.py 3 Jan 2004 17:43:14 -0000 1.102
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.102 2004/01/03 17:43:14 dischi
+ # OVERLAY_DIR is always used
+ #
# Revision 1.101 2004/01/01 12:27:38 dischi
# bugfix and add config.TIME_DEBUG to trace the needed time
***************
*** 345,350 ****
print
! if config.OVERLAY_DIR_STORE_MMPYTHON_DATA and mmpython.object_cache and \
! hasattr(mmpython.object_cache, 'md5_cachedir'):
_debug_('use OVERLAY_DIR for mmpython cache')
mmpython.object_cache.md5_cachedir = False
--- 348,352 ----
print
! if mmpython.object_cache and hasattr(mmpython.object_cache, 'md5_cachedir'):
_debug_('use OVERLAY_DIR for mmpython cache')
mmpython.object_cache.md5_cachedir = False
***************
*** 441,445 ****
break
else:
! _debug_('no eventhandler for event %s' % event,2)
else:
--- 443,447 ----
break
else:
! _debug_('no eventhandler for event %s' % event, 2)
else:
Index: menu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/menu.py,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** menu.py 29 Dec 2003 22:07:14 -0000 1.74
--- menu.py 3 Jan 2004 17:43:14 -0000 1.75
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.75 2004/01/03 17:43:14 dischi
+ # OVERLAY_DIR is always used
+ #
# Revision 1.74 2003/12/29 22:07:14 dischi
# renamed xml_file to fxd_file
***************
*** 411,415 ****
return
! _debug_('no eventhandler for event %s' % event)
return
--- 414,418 ----
return
! _debug_('no eventhandler for event %s' % event, 2)
return
***************
*** 612,616 ****
return
! _debug_('no eventhandler for event %s' % str(event))
return 0
--- 615,619 ----
return
! _debug_('no eventhandler for event %s' % str(event), 2)
return 0
Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** osd.py 2 Jan 2004 14:29:20 -0000 1.116
--- osd.py 3 Jan 2004 17:43:14 -0000 1.117
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.117 2004/01/03 17:43:14 dischi
+ # OVERLAY_DIR is always used
+ #
# Revision 1.116 2004/01/02 14:29:20 dischi
# correct font outline drawing
***************
*** 20,29 ****
# move the shadow code into osd.py
#
- # Revision 1.113 2003/12/31 16:41:43 dischi
- # cache all thumbnails when config.OVERLAY_DIR_STORE_THUMBNAILS
- #
- # Revision 1.112 2003/12/30 15:29:04 dischi
- # support for OVERLAY_DIR_STORE_THUMBNAILS
- #
# Revision 1.111 2003/12/07 14:48:49 dischi
# clean up the busy icon
--- 23,26 ----
***************
*** 1225,1272 ****
if thumbnail:
sinfo = os.stat(filename)
! if config.OVERLAY_DIR_STORE_THUMBNAILS or sinfo[stat.ST_SIZE] >
10000:
! if config.OVERLAY_DIR_STORE_THUMBNAILS:
! thumb = vfs.getoverlay(filename + '.raw')
! else:
! thumb = os.path.join('%s/thumbnails/%s.raw' % \
! (config.FREEVO_CACHEDIR,
!
util.hexify(md5.new(filename).digest())))
! data = None
! try:
! if os.stat(thumb)[stat.ST_MTIME] > sinfo[stat.ST_MTIME]:
! data = util.read_pickle(thumb)
! except OSError:
! pass
!
! if not data:
! f=open(filename, 'rb')
! tags=exif.process_file(f)
! f.close()
! if tags.has_key('JPEGThumbnail'):
! image =
Image.open(cStringIO.StringIO(tags['JPEGThumbnail']))
! else:
! # convert with Imaging, pygame doesn't work
! image = Image.open(filename)
! if image.size[0] > 300 and image.size[1] > 300:
! image.thumbnail((300,300))
! if image.mode == 'P':
! image = image.convert('RGB')
! # save for future use
! if config.OVERLAY_DIR_STORE_THUMBNAILS:
! data = (image.tostring(), image.size, image.mode)
! util.save_pickle(data, thumb)
! else:
! data = (filename, image.tostring(), image.size,
image.mode)
! util.save_pickle(data, thumb)
! if not config.OVERLAY_DIR_STORE_THUMBNAILS:
! data = data[1:]
! # convert to pygame image
! image = pygame.image.fromstring(data[0], data[1], data[2])
try:
--- 1222,1259 ----
if thumbnail:
sinfo = os.stat(filename)
! thumb = vfs.getoverlay(filename + '.raw')
! data = None
! try:
! if os.stat(thumb)[stat.ST_MTIME] > sinfo[stat.ST_MTIME]:
! data = util.read_pickle(thumb)
! except OSError:
! pass
! if not data:
! f=open(filename, 'rb')
! tags=exif.process_file(f)
! f.close()
! image = None
! if tags.has_key('JPEGThumbnail'):
! image = Image.open(cStringIO.StringIO(tags['JPEGThumbnail']))
! if not image or image.size[0] < 100 or image.size[1] < 100:
! # convert with Imaging, pygame doesn't work
! image = Image.open(filename)
! if image.size[0] > 300 and image.size[1] > 300:
! image.thumbnail((300,300), Image.ANTIALIAS)
!
! if image.mode == 'P':
! image = image.convert('RGB')
!
! # save for future use
! data = (image.tostring(), image.size, image.mode)
! util.save_pickle(data, thumb)
! # convert to pygame image
! image = pygame.image.fromstring(data[0], data[1], data[2])
try:
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
