Author: duncan
Date: Sun Feb 24 10:57:21 2008
New Revision: 10423
Log:
[ 1890498 ] second patch applied
Modified:
branches/rel-1-7/freevo/src/video/configure.py
branches/rel-1/freevo/src/video/configure.py
Modified: branches/rel-1-7/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/configure.py (original)
+++ branches/rel-1-7/freevo/src/video/configure.py Sun Feb 24 10:57:21 2008
@@ -60,7 +60,10 @@
# set reasonable defaults when attributes are missing or not set
if not a.has_key('id') or a['id'] is None:
- a['id'] = int(item.info['audio'].index(audio))+1
+ # workaround for kaa.metadata not having audio ids for ogm and avi
files
+ a['id'] = int(item.info['audio'].index(audio))
+ if a.has_key('mime') and a['mime'] == 'video/avi':
+ a['id'] += 1
if not a.has_key('title') or a['title'] is None:
a['title'] = ''
@@ -72,7 +75,7 @@
a['channels'] = 2 # wild guess :-)
if not a.has_key('codec') or a['codec'] is None:
- a['codec'] = '???'
+ a['codec'] = _('Unknown')
txt = '%(language)s %(title)s (channels=%(channels)s:%(codec)s)' % a
menu_items.append(menu.MenuItem(txt, audio_selection, (item, a['id'])))
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 Sun Feb 24 10:57:21 2008
@@ -60,7 +60,10 @@
# set reasonable defaults when attributes are missing or not set
if not a.has_key('id') or a['id'] is None:
- a['id'] = int(item.info['audio'].index(audio))+1
+ # workaround for kaa.metadata not having audio ids for ogm and avi
files
+ a['id'] = int(item.info['audio'].index(audio))
+ if a.has_key('mime') and a['mime'] == 'video/avi':
+ a['id'] += 1
if not a.has_key('title') or a['title'] is None:
a['title'] = ''
@@ -72,7 +75,7 @@
a['channels'] = 2 # wild guess :-)
if not a.has_key('codec') or a['codec'] is None:
- a['codec'] = '???'
+ a['codec'] = _('Unknown')
txt = '%(language)s %(title)s (channels=%(channels)s:%(codec)s)' % a
menu_items.append(menu.MenuItem(txt, audio_selection, (item, a['id'])))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
