In my previous implementation, a couple of mplayer-options attributes
were not supported. Now they are.
Matthieu
--
(~._.~) Matthieu Weber - Université de Jyväskylä (~._.~)
( ? ) email : [EMAIL PROTECTED] ( ? )
()- -() public key id : 452AE0AD ()- -()
(_)-(_) "Humor ist, wenn man trotzdem lacht (Germain Muller)" (_)-(_)
--- xml_parser.py.orig Thu Mar 20 22:52:34 2003
+++ xml_parser.py Fri Mar 21 09:38:04 2003
@@ -273,9 +273,6 @@
if variant:
if len(variant['parts']) > 1:
vitem = VideoItem('', None)
- vitem.mplayer_options = variant['mplayer-options']
- if video['items'][variant['parts'][0]['ref']]['mplayer-options']:
- vitem.mplayer_options += " " +
video['items'][part_ref]['mplayer-options']
for part in variant['parts']:
part_ref = part['ref']
subitem = VideoItem(video['items'][part_ref]['data'], vitem)
@@ -286,11 +283,17 @@
vitem.rom_id += [ subitem.media_id ]
subitem.subtitle_file = part['subtitle']
subitem.audio_file = part['audio']
- subitem.mplayer_options = variant['mplayer-options']
+ subitem.mplayer_options = ''
+ if video['mplayer-options']:
+ subitem.mplayer_options += ' ' + video['mplayer-options']
if video['items'][part_ref]['mplayer-options']:
- if not subitem.mplayer_options:
- subitem.mplayer_options = ""
- subitem.mplayer_options += " " +
video['items'][part_ref]['mplayer-options']
+ subitem.mplayer_options += ' ' +
video['items'][part_ref]['mplayer-options']
+ if variant['mplayer-options']:
+ subitem.mplayer_options += ' ' + variant['mplayer-options']
+ if part['mplayer-options']:
+ subitem.mplayer_options += " " + part['mplayer-options']
+ if not subitem.mplayer_options:
+ subitem.mplayer_options = None
vitem.subitems += [ subitem ]
elif len(variant['parts']) == 1:
@@ -302,11 +305,18 @@
vitem.rom_id += [ vitem.media_id ]
vitem.subtitle_file = variant['parts'][0]['subtitle']
vitem.audio_file = variant['parts'][0]['audio']
- vitem.mplayer_options = variant['mplayer-options']
+
+ vitem.mplayer_options = ''
+ if video['mplayer-options']:
+ vitem.mplayer_options += ' ' + video['mplayer-options']
if video['items'][part_ref]['mplayer-options']:
- if not vitem.mplayer_options:
- vitem.mplayer_options = ""
- vitem.mplayer_options += " " +
video['items'][part_ref]['mplayer-options']
+ vitem.mplayer_options += ' ' +
video['items'][part_ref]['mplayer-options']
+ if variant['mplayer-options']:
+ vitem.mplayer_options += ' ' + variant['mplayer-options']
+ if variant['parts'][0]['mplayer-options']:
+ vitem.mplayer_options += " " + variant['parts'][0]['mplayer-options']
+ if not vitem.mplayer_options:
+ vitem.mplayer_options = None
else:
if len(video['items-list']) > 1:
vitem = VideoItem('', None)
@@ -316,7 +326,13 @@
subitem.media_id = video['items'][v]['media-id']
if subitem.media_id:
vitem.rom_id += [ subitem.media_id ]
- subitem.mplayer_options = video['items'][v]['mplayer-options']
+ subitem.mplayer_options = ''
+ if video['mplayer-options']:
+ subitem.mplayer_options += ' ' + video['mplayer-options']
+ if video['items'][v]['mplayer-options']:
+ subitem.mplayer_options += ' ' +
video['items'][v]['mplayer-options']
+ if not subitem.mplayer_options:
+ subitem.mplayer_options = None
vitem.subitems += [ subitem ]
else:
ref = video['items-list'][0]
@@ -325,7 +341,13 @@
vitem.media_id = video['items'][ref]['media-id']
if vitem.media_id:
vitem.rom_id += [ vitem.media_id ]
- vitem.mplayer_options = video['items'][ref]['mplayer-options']
+ vitem.mplayer_options = ''
+ if video['mplayer-options']:
+ vitem.mplayer_options += ' ' + video['mplayer-options']
+ if video['items'][ref]['mplayer-options']:
+ vitem.mplayer_options += ' ' + video['items'][ref]['mplayer-options']
+ if not vitem.mplayer_options:
+ vitem.mplayer_options = None
return vitem
