Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19898
Modified Files:
osd.py
Log Message:
support for OVERLAY_DIR_STORE_THUMBNAILS
Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** osd.py 7 Dec 2003 14:48:49 -0000 1.111
--- osd.py 30 Dec 2003 15:29:04 -0000 1.112
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # 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
***************
*** 27,31 ****
#
# Revision 1.106 2003/11/23 19:48:59 krister
! # Added optional new blend settings (nr of steps and total time), must be enabled
explicitly in freevo_config
#
# Revision 1.105 2003/11/23 18:44:37 krister
--- 30,35 ----
#
# Revision 1.106 2003/11/23 19:48:59 krister
! # Added optional new blend settings (nr of steps and total time), must be
! # enabled explicitly in freevo_config
#
# Revision 1.105 2003/11/23 18:44:37 krister
***************
*** 1139,1157 ****
sinfo = os.stat(filename)
if sinfo[stat.ST_SIZE] > 10000:
! m = md5.new(filename)
! thumb = os.path.join('%s/thumbnails/%s.raw' % \
! (config.FREEVO_CACHEDIR,
! util.hexify(m.digest())))
data = None
! if os.path.isfile(thumb):
! tinfo = os.stat(thumb)
! if tinfo[stat.ST_MTIME] > sinfo[stat.ST_MTIME]:
! data = util.read_pickle(thumb)
!
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']))
--- 1143,1162 ----
sinfo = os.stat(filename)
if 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
! if os.path.isfile(thumb) and \
! os.stat(thumb)[stat.ST_MTIME] > sinfo[stat.ST_MTIME]:
! data = util.read_pickle(thumb)
!
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']))
***************
*** 1160,1164 ****
image = Image.open(filename)
! image.thumbnail((300,300))
if image.mode == 'P':
--- 1165,1170 ----
image = Image.open(filename)
! if image.size[0] > 300 and image.size[1] > 300:
! image.thumbnail((300,300))
if image.mode == 'P':
***************
*** 1166,1174 ****
# save for future use
! data = (filename, image.tostring(), image.size, image.mode)
! util.save_pickle(data, thumb)
!
# convert to pygame image
! image = pygame.image.fromstring(data[1], data[2], data[3])
try:
--- 1172,1186 ----
# 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:
-------------------------------------------------------
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
