Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv17529/src/video
Modified Files:
videoitem.py xml_parser.py
Log Message:
*ROM media just shows up when needed, ie: audiocd is not displayed in
video main menu.
* ROM media is able to use variants, subtitles and more.
* When media is not present, ask for it and wait until media is
identified. A better solution is to force identify media and BLOCK until
it's done.
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** videoitem.py 20 Aug 2003 20:47:02 -0000 1.72
--- videoitem.py 21 Aug 2003 20:54:44 -0000 1.73
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.73 2003/08/21 20:54:44 gsbarbieri
+ # *ROM media just shows up when needed, ie: audiocd is not displayed in
+ # video main menu.
+ # * ROM media is able to use variants, subtitles and more.
+ # * When media is not present, ask for it and wait until media is
+ # identified. A better solution is to force identify media and BLOCK until
+ # it's done.
+ #
# Revision 1.72 2003/08/20 20:47:02 outlyer
# Fixed the bookmark file "parser" I don't know what happened, but it was
***************
*** 331,334 ****
--- 339,354 ----
self.tv_show = obj.tv_show
self.id = obj.id
+
+ self.variants = obj.variants
+ self.subitems = obj.subitems
+ self.files_options = obj.files_options
+ self.current_subitem = obj.current_subitem
+ self.bookmarkfile = obj.bookmarkfile
+ self.subtitle_file = obj.subtitle_file
+ self.audio_file = obj.audio_file
+ self.filename = obj.filename
+
+
+
def getattr(self, attr):
***************
*** 399,402 ****
--- 419,423 ----
items += [ (self.confirm_delete, 'Delete file') ]
+
if self.variants:
items = [ (self.show_variants, 'Show variants') ] + items
***************
*** 494,500 ****
util.mount(mountdir)
else:
! # TODO: prompt for the right media
! AlertBox(text = 'Media not found for file %s' % (file)).show()
! rc.post_event(em.PLAY_END)
return
--- 515,549 ----
util.mount(mountdir)
else:
!
! def do_tryagain():
! # TODO: force to identify media instead of wait
! box = PopupBox( text="Wait while detecting media..." )
! box.show()
! l=1
! for i in range( 1 ): # 10 times
!
! for media in config.REMOVABLE_MEDIA:
! # media has no id? maybe identifying... wait
! if not media.id:
! time.sleep( 2 )
! if media.id == self.media_id:
! # we found it! Stop looping
! l=0
! break
!
! if not l:
! break
! box.destroy()
!
! self.play( arg, menuw )
! # do_tryagain()
!
!
! ConfirmBox( text=('Media not found for file "%s".\n'+
! 'Please insert the media.') % file,
! handler=do_tryagain ).show()
!
! rc.post_event( em.PLAY_END )
!
return
***************
*** 584,588 ****
self.menuw.hide()
! error = self.video_player.play(file, mplayer_options, self)
if error:
--- 633,643 ----
self.menuw.hide()
! if not self.video_player:
! self.video_player = plugin.getbyname(plugin.VIDEO_PLAYER)
!
! if self.video_player:
! error = self.video_player.play(file, mplayer_options, self)
! else:
! error = "No video player avaiable!"
if error:
Index: xml_parser.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/xml_parser.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** xml_parser.py 3 Aug 2003 10:11:37 -0000 1.30
--- xml_parser.py 21 Aug 2003 20:54:45 -0000 1.31
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2003/08/21 20:54:45 gsbarbieri
+ # *ROM media just shows up when needed, ie: audiocd is not displayed in
+ # video main menu.
+ # * ROM media is able to use variants, subtitles and more.
+ # * When media is not present, ask for it and wait until media is
+ # identified. A better solution is to force identify media and BLOCK until
+ # it's done.
+ #
# Revision 1.30 2003/08/03 10:11:37 dischi
# remove debug
***************
*** 611,615 ****
else:
mitem = make_videoitem(video, None)
! mitem.parent = parent
mitem.name = title
mitem.image = image
--- 619,623 ----
else:
mitem = make_videoitem(video, None)
!
mitem.name = title
mitem.image = image
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
