Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv21683
Modified Files:
videoitem.py xml_parser.py
Log Message:
Patch from Matthieu Weber with some bugfixes
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** videoitem.py 3 Mar 2003 00:36:53 -0000 1.18
--- videoitem.py 14 Mar 2003 16:24:33 -0000 1.19
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.19 2003/03/14 16:24:33 dischi
+ # Patch from Matthieu Weber with some bugfixes
+ #
# Revision 1.18 2003/03/03 00:36:53 rshortt
# Implimenting the new PopupBox for the 'Scanning disc, be patient...' messages.
***************
*** 224,227 ****
--- 227,233 ----
self.parent.current_item = self
+ self.menuw = menuw
+ self.menuw_visible = menuw.visible
+
if self.subitems:
self.current_subitem = self.subitems[0]
***************
*** 292,298 ****
mplayer_options += ' -vop pp=fd'
-
- self.menuw = menuw
- self.menuw_visible = menuw.visible
if menuw.visible:
--- 298,301 ----
Index: xml_parser.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/xml_parser.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xml_parser.py 17 Feb 2003 18:32:24 -0000 1.8
--- xml_parser.py 14 Mar 2003 16:24:34 -0000 1.9
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.9 2003/03/14 16:24:34 dischi
+ # Patch from Matthieu Weber with some bugfixes
+ #
# Revision 1.8 2003/02/17 18:32:24 dischi
# Added the infos from the xml file to VideoItem
***************
*** 227,231 ****
except KeyError:
pass
! p['subtitle']['file'] =
part_child.textof().encode('ascii')
elif part_child.name == u'audio':
p['audio']['media-id'] = None
--- 230,234 ----
except KeyError:
pass
! p['subtitle']['file'] =
part_child.textof().encode('latin-1')
elif part_child.name == u'audio':
p['audio']['media-id'] = None
***************
*** 286,289 ****
--- 289,294 ----
subitem.mplayer_options = variant['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']
vitem.subitems += [ subitem ]
***************
*** 300,303 ****
--- 305,310 ----
vitem.mplayer_options = variant['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']
else:
***************
*** 371,375 ****
try:
! disc_set['title'] = freevo_child.attrs[('', "title")]
except KeyError:
pass
--- 378,382 ----
try:
! disc_set['title'] = freevo_child.attrs[('',
"title")].encode('latin-1')
except KeyError:
pass
***************
*** 390,394 ****
disc['l_re'] = None
try:
! disc['l_re'] = disc_set_child.attrs[('', "l_re")]
except KeyError:
if label_required == 1:
--- 397,401 ----
disc['l_re'] = None
try:
! disc['l_re'] = disc_set_child.attrs[('', "label-regexp")]
except KeyError:
if label_required == 1:
***************
*** 416,420 ****
dsitem.rom_label += [ disc['l_re'] ]
for disc in disc_set['disc']:
! dsitem.rom_id += [ disc['media-id'] ]
movies += [ dsitem ]
--- 423,428 ----
dsitem.rom_label += [ disc['l_re'] ]
for disc in disc_set['disc']:
! if disc['media-id']:
! dsitem.rom_id += [ disc['media-id'] ]
movies += [ dsitem ]
***************
*** 456,463 ****
video['items'][p]['data'] = os.path.join(dir, filename)
for i in range(len(duplicate_check)):
! if (unicode(duplicate_check[i], 'latin1', 'ignore') == \
! os.path.join(dir, filename)):
! del duplicate_check[i]
! break
mitem = None
--- 464,476 ----
video['items'][p]['data'] = os.path.join(dir, filename)
for i in range(len(duplicate_check)):
! try:
! if (unicode(duplicate_check[i], 'latin1', 'ignore') == \
! os.path.join(dir, filename)):
! del duplicate_check[i]
! break
! except:
! if duplicate_check[i] == os.path.join(dir, filename):
! del duplicate_check[i]
! break
mitem = None
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
