Author: duncan
Date: Wed Mar 12 16:40:37 2008
New Revision: 10510
Log:
[ 1911247 ] fix for audio streams in audio selection menu
Patch from Valera Koval applied but changed
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/video/configure.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/video/configure.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Wed Mar 12 16:40:37 2008
@@ -27,6 +27,7 @@
* Updated tv program to stop reporting that a program is over (F#1886568)
* Updated xml tv epg to allow a timezone to be specified (F#1889376)
* Updated youtube video plug-in to look up two links (F#1890214)
+ * Fixed audio selection for avi video files with more than one audio
(B#1911247)
* Fixed audio selection for the first track for mkv and ogm video files
(B#1890498)
* Fixed audioscrobbler plug-in not sending songs to last.fm (B#1902461)
* Fixed cdbackup plug-in to allow empty parameters (B#1889068)
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 Wed Mar 12 16:40:37 2008
@@ -55,14 +55,14 @@
item = arg
menu_items = []
- for audio in item.info['audio']:
- a = copy.copy(audio)
-
+ for i in range(len(item.info['audio'])):
+ a = copy.copy(item.info['audio'][i])
# set reasonable defaults when attributes are missing or not set
+
if not a.has_key('id') or a['id'] is None:
# 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'] = i
+ if item.info.has_key('mime') and item.info['mime'] == 'video/avi':
a['id'] += 1
if not a.has_key('title') or a['title'] is None:
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Wed Mar 12 16:40:37 2008
@@ -30,6 +30,7 @@
* Updated tv program to stop reporting that a program is over (F#1886568)
* Updated xml tv epg to allow a timezone to be specified (F#1889376)
* Updated youtube video plug-in to look up two links (F#1890214)
+ * Fixed audio selection for avi video files with more than one audio
(B#1911247)
* Fixed audio selection for the first track for mkv and ogm video files
(B#1890498)
* Fixed audioscrobbler plug-in not sending songs to last.fm (B#1902461)
* Fixed cdbackup plug-in to allow empty parameters (B#1889068)
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 Wed Mar 12 16:40:37 2008
@@ -55,14 +55,14 @@
item = arg
menu_items = []
- for audio in item.info['audio']:
- a = copy.copy(audio)
-
+ for i in range(len(item.info['audio'])):
+ a = copy.copy(item.info['audio'][i])
# set reasonable defaults when attributes are missing or not set
+
if not a.has_key('id') or a['id'] is None:
# 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'] = i
+ if item.info.has_key('mime') and item.info['mime'] == 'video/avi':
a['id'] += 1
if not a.has_key('title') or a['title'] is None:
-------------------------------------------------------------------------
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
