Author: duncan
Date: Sat Jun 2 21:42:17 2007
New Revision: 9639
Modified:
branches/rel-1/freevo/src/item.py
branches/rel-1/freevo/src/video/configure.py
branches/rel-1/freevo/src/video/videoitem.py
Log:
Changed the VIDEO options so that a menu item is only displayed when the
value is not None. Fixed the deinterlace option that cannot be set until
the video item has a file name.
Modified: branches/rel-1/freevo/src/item.py
==============================================================================
--- branches/rel-1/freevo/src/item.py (original)
+++ branches/rel-1/freevo/src/item.py Sat Jun 2 21:42:17 2007
@@ -295,7 +295,7 @@
if val == value:
if self.info[key]:
if not self.delete_info(key):
- _debug_(u'unable to store \"%s\":\"%s\" info for
\'%s\'' % (key, value, self.name), 0)
+ _debug_(u'unable to store \'%s\':\'%s\' info for
\'%s\'' % (key, value, self.filename), 0)
else:
self.store_info(key, value)
return
@@ -306,11 +306,16 @@
"""
store the key/value in metadata
"""
+ #if not self.filename:
+ # return
+
if isinstance(self.info, mediainfo.Info):
if not self.info.store(key, value):
- _debug_(u'unable to store info for \'%s\'' % self.name, 0)
+ _debug_(u'cannot store \'%s\':\'%s\' for \'%s\'' % (key,
value, self.filename), 0)
+ #print '%s : %s' % (dir(self), type(self))
+ _debug_('%s' % self.__dict__)
else:
- _debug_(u'unable to store info for that kind of item \'%s\'' %
self.name, 0)
+ _debug_(u'cannot store \'%s\':\'%s\' for \'%s\' item' % (key,
value, self.filename), 0)
def delete_info(self, key):
Modified: branches/rel-1/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1/freevo/src/video/configure.py (original)
+++ branches/rel-1/freevo/src/video/configure.py Sat Jun 2 21:42:17 2007
@@ -236,11 +236,11 @@
def add_toogle3(name, item, var):
if item[var] == -1:
- return menu.MenuItem(_('Turn TOP field first'), toggle3, (name, item,
var))
+ return menu.MenuItem(_('Activate TOP field first'), toggle3, (name,
item, var))
elif item[var] == 0:
- return menu.MenuItem(_('Turn BOTTOM field first'), toggle3, (name,
item, var))
+ return menu.MenuItem(_('Activate BOTTOM field first'), toggle3, (name,
item, var))
else:
- return menu.MenuItem(_('Turn AUTO field first'), toggle3, (name, item,
var))
+ return menu.MenuItem(_('Activate AUTO field first'), toggle3, (name,
item, var))
#
@@ -270,13 +270,13 @@
item.info['type'] and item.info['type'].lower().find('mpeg') !=
-1):
if hasattr(config, 'VIDEO_DEINTERLACE') and config.VIDEO_DEINTERLACE
!= None:
- items += [ add_toogle(_('Deinterlacing'), item, 'deinterlace') ]
+ items += [ add_toogle(_('de-interlacing'), item, 'deinterlace') ]
if hasattr(config, 'VIDEO_USE_XVMC') and config.VIDEO_USE_XVMC != None:
items += [ add_toogle(_('X-Video Motion Compensation (xvmc)'),
item, 'xvmc') ]
if hasattr(config, 'VIDEO_FIELD_DOMINANCE') and
config.VIDEO_FIELD_DOMINANCE != None:
- items += [ add_toogle3(_('Turn BOTTOM field first'), item,
'field-dominance') ]
+ items += [ add_toogle3(_('Activate BOTTOM field first'), item,
'field-dominance') ]
return items
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Sat Jun 2 21:42:17 2007
@@ -53,12 +53,15 @@
def __init__(self, url, parent, info=None, parse=True):
self.autovars = []
- if config.VIDEO_DEINTERLACE != None:
- self.autovars.append(('deinterlace', config.VIDEO_DEINTERLACE))
- if config.VIDEO_USE_XVMC != None:
- self.autovars.append(('xvmc', config.VIDEO_USE_XVMC))
- if config.VIDEO_FIELD_DOMINANCE != None:
- self.autovars.append(('field-dominance',
config.VIDEO_FIELD_DOMINANCE))
+
+ video_deinterlace = config.VIDEO_DEINTERLACE != None and
config.VIDEO_DEINTERLACE or False
+ self.autovars.append(('deinterlace', video_deinterlace))
+
+ video_use_xvmc = config.VIDEO_USE_XVMC != None and
config.VIDEO_USE_XVMC or False
+ self.autovars.append(('xvmc', video_use_xvmc))
+
+ video_field_dominance = config.VIDEO_FIELD_DOMINANCE != None and
config.VIDEO_FIELD_DOMINANCE or False
+ self.autovars.append(('field-dominance', video_field_dominance))
Item.__init__(self, parent)
@@ -131,6 +134,12 @@
if discset_information.has_key(fid):
self.mplayer_options = discset_information[fid]
+ if config.VIDEO_DEINTERLACE and self.info['deinterlaced']:
+ # force deinterlacing
+ self['deinterlace'] = True
+ else:
+ self['deinterlace'] = False
+
def __str__(self):
s = pformat(self, depth=2)
@@ -181,12 +190,6 @@
self.image = image
self.files.image = image
- if config.VIDEO_DEINTERLACE and self.info['interlaced']:
- # force deinterlacing
- self['deinterlace'] = 1
- else:
- self['deinterlace'] = 0
-
def id(self):
"""
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
