Author: duncan Date: Sat Dec 16 10:45:37 2006 New Revision: 8733 Modified: branches/rel-1/freevo/src/image/__init__.py branches/rel-1/freevo/src/main.py branches/rel-1/freevo/src/osd.py branches/rel-1/freevo/src/util/fileops.py branches/rel-1/freevo/src/util/fxdimdb.py branches/rel-1/freevo/src/util/mediainfo.py
Log: Various changes for kaa.metadata changes Various fixes for kaa.imlib2 changes Modified: branches/rel-1/freevo/src/image/__init__.py ============================================================================== --- branches/rel-1/freevo/src/image/__init__.py (original) +++ branches/rel-1/freevo/src/image/__init__.py Sat Dec 16 10:45:37 2006 @@ -32,7 +32,7 @@ import os # Add support for bins album files (http://bins.sautret.org/) -import kaa.metadata.misc.dirinfo as bins +#import kaa.metadata.misc.dirinfo as bins import config import util @@ -78,17 +78,17 @@ """ set informations for a diritem based on album.xml """ - dirinfo = bins.DirInfo(diritem.dir) - if dirinfo.has_key('desc'): - info = dirinfo['desc'] - - if dirinfo.has_key('sampleimage') and dirinfo['sampleimage']: - image = vfs.join(diritem.dir, dirinfo['sampleimage']) - if vfs.isfile(image): - diritem.image = image + #dirinfo = bins.DirInfo(diritem.dir) + #if dirinfo.has_key('desc'): + # info = dirinfo['desc'] + + #if dirinfo.has_key('sampleimage') and dirinfo['sampleimage']: + # image = vfs.join(diritem.dir, dirinfo['sampleimage']) + # if vfs.isfile(image): + # diritem.image = image - if dirinfo.has_key('title') and dirinfo['title']: - diritem.name = dirinfo['title'] + #if dirinfo.has_key('title') and dirinfo['title']: + # diritem.name = dirinfo['title'] def fxdhandler(self, fxd, node): Modified: branches/rel-1/freevo/src/main.py ============================================================================== --- branches/rel-1/freevo/src/main.py (original) +++ branches/rel-1/freevo/src/main.py Sat Dec 16 10:45:37 2006 @@ -76,11 +76,11 @@ # for already fixed bugs try: import kaa.metadata.version - if kaa.metadata.version.VERSION < 0.5: + if kaa.metadata.version.VERSION < 0.6: raise ImportError except ImportError: print 'Error: Installed kaa.metadata version is too old.' - print 'Please update kaa.metadata to version 0.5 or higher or get it with subversion' + print 'Please update kaa.metadata to version 0.6 or higher or get it with subversion' print 'svn export svn://svn.freevo.org/kaa/trunk/metadata kaa/metadata' print sys.exit(0) Modified: branches/rel-1/freevo/src/osd.py ============================================================================== --- branches/rel-1/freevo/src/osd.py (original) +++ branches/rel-1/freevo/src/osd.py Sat Dec 16 10:45:37 2006 @@ -607,8 +607,11 @@ return None try: - image = pygame.image.fromstring(url.tostring(), url.size, url.mode) - except: + if url.mode == 'BGRA': + url.mode = 'RGBA' + image = pygame.image.fromstring(str(url.get_raw_data(format=url.mode)), url.size, url.mode) + except Exception, e: + print e if url[:8] == 'thumb://': filename = os.path.abspath(url[8:]) Modified: branches/rel-1/freevo/src/util/fileops.py ============================================================================== --- branches/rel-1/freevo/src/util/fileops.py (original) +++ branches/rel-1/freevo/src/util/fileops.py Sat Dec 16 10:45:37 2006 @@ -41,7 +41,6 @@ # image stuff import kaa.imlib2 as Image -import cStringIO from kaa.metadata.image import EXIF as exif @@ -470,7 +469,7 @@ if thumbnail: try: - image = Image.open(cStringIO.StringIO(thumbnail)) + image = Image.open_from_memory(thumbnail) except Exception, e: print 'Invalid thumbnail for %s' % filename if config.DEBUG: @@ -484,7 +483,7 @@ f.close() if tags.has_key('JPEGThumbnail'): - image = Image.open(cStringIO.StringIO(tags['JPEGThumbnail'])) + image = Image.open_from_memory(tags['JPEGThumbnail']) except Exception, e: print 'Error loading thumbnail %s' % filename if config.DEBUG: Modified: branches/rel-1/freevo/src/util/fxdimdb.py ============================================================================== --- branches/rel-1/freevo/src/util/fxdimdb.py (original) +++ branches/rel-1/freevo/src/util/fxdimdb.py Sat Dec 16 10:45:37 2006 @@ -52,7 +52,7 @@ import config import util -from kaa.metadata.disc.discinfo import cdrom_disc_id +import kaa.metadata as mmpython #Constants freevo_version = '1.6.0' @@ -719,8 +719,10 @@ """drive (device string) return a unique identifier for the disc""" - if not vfs.exists(drive): return drive - return cdrom_disc_id(drive)[1] + if not vfs.exists(drive): + return drive + (type, id) = mmpython.cdrom.status(drive) + return id def print_info(self): Modified: branches/rel-1/freevo/src/util/mediainfo.py ============================================================================== --- branches/rel-1/freevo/src/util/mediainfo.py (original) +++ branches/rel-1/freevo/src/util/mediainfo.py Sat Dec 16 10:45:37 2006 @@ -34,7 +34,7 @@ import copy import kaa.metadata as mmpython -from kaa.metadata.disc.discinfo import cdrom_disc_id +#from kaa.metadata.disc.discinfo import cdrom_disc_id import config import util @@ -576,7 +576,8 @@ """ return mmpython disc information for the media """ - type, id = cdrom_disc_id(media.devicename) + print media.devicename + type, id = mmpython.cdrom.status(media.devicename) if not id: # bad disc, e.g. blank disc return {} @@ -730,14 +731,12 @@ # if config.DEBUG > 2: - mmpython.mediainfo.DEBUG = config.DEBUG - mmpython.factory.DEBUG = config.DEBUG + mmpython.factory.DEBUG = config.DEBUG else: - mmpython.mediainfo.DEBUG = 0 - mmpython.factory.DEBUG = 0 + mmpython.factory.DEBUG = 0 mmpython.USE_NETWORK = config.USE_NETWORK -mmpython.disc.discinfo.CREATE_MD5_ID = config.MMPYTHON_CREATE_MD5_ID +mmpython.cdrom.CREATE_MD5_ID = config.MMPYTHON_CREATE_MD5_ID ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Freevo-cvslog mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
