Update of /cvsroot/freevo/freevo/src/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1348
Modified Files:
imageitem.py interface.py
Log Message:
switch to new mediainfo module
Index: interface.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/interface.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** interface.py 13 Sep 2004 19:32:46 -0000 1.6
--- interface.py 10 Apr 2005 17:58:45 -0000 1.7
***************
*** 14,17 ****
--- 14,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2005/04/10 17:58:45 dischi
+ # switch to new mediainfo module
+ #
# Revision 1.6 2004/09/13 19:32:46 dischi
# move the fxdhandler into an extra file
***************
*** 83,94 ****
! def get(self, parent, files):
"""
return a list of items based on the files
"""
items = []
! for file in util.find_matches(files, config.IMAGE_SUFFIX):
items.append(ImageItem(file, parent))
- files.remove(file)
return items
--- 86,96 ----
! def get(self, parent, listing):
"""
return a list of items based on the files
"""
items = []
! for file in listing.match_suffix(config.IMAGE_SUFFIX):
items.append(ImageItem(file, parent))
return items
Index: imageitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/imageitem.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** imageitem.py 13 Sep 2004 18:00:49 -0000 1.30
--- imageitem.py 10 Apr 2005 17:58:45 -0000 1.31
***************
*** 13,16 ****
--- 13,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2005/04/10 17:58:45 dischi
+ # switch to new mediainfo module
+ #
# Revision 1.30 2004/09/13 18:00:49 dischi
# last cleanups for the image module in Freevo
***************
*** 59,63 ****
from event import *
from viewer import *
!
class ImageItem(MediaItem):
--- 62,66 ----
from event import *
from viewer import *
! import util.thumbnail
class ImageItem(MediaItem):
***************
*** 65,80 ****
An item for image files
"""
! def __init__(self, url, parent, name = None,
! duration = config.IMAGEVIEWER_DURATION):
# set autovars to 'rotation' so that this value is
# stored between Freevo sessions
! self.autovars = [ ( 'rotation', 0 ) ]
MediaItem.__init__(self, 'image', parent)
! if name:
! self.name = name
! self.set_url(url, search_image=False)
! if self.mode == 'file':
! self.image = self.filename
self.duration = duration
--- 68,81 ----
An item for image files
"""
! def __init__(self, url, parent, duration = config.IMAGEVIEWER_DURATION):
# set autovars to 'rotation' so that this value is
# stored between Freevo sessions
! self.autovars = { 'rotation': 0 }
MediaItem.__init__(self, 'image', parent)
! # set url and parse the name
! self.set_url(url, search_cover=False)
self.duration = duration
+ if self.url.startswith('file://'):
+ self.image = self.filename
***************
*** 107,111 ****
return u'%s%s' % (os.stat(self.filename).st_ctime,
Unicode(self.filename))
! return Unicode(self.filename)
--- 108,112 ----
return u'%s%s' % (os.stat(self.filename).st_ctime,
Unicode(self.filename))
! return Unicode(self.name)
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
