Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv17529/src/plugins
Modified Files:
mediamenu.py rom_drives.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: mediamenu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mediamenu.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mediamenu.py 20 Aug 2003 22:45:15 -0000 1.10
--- mediamenu.py 21 Aug 2003 20:54:44 -0000 1.11
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.11 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.10 2003/08/20 22:45:15 gsbarbieri
# Capitalize (MOVIE|IMAGE|VIDEO|...). UPPERCASE IS UGLY!
***************
*** 85,88 ****
--- 93,106 ----
import plugin
+ import plugins
+ # Types that will be displayed when in 'key' display_type
+ # Use this to avoid displaying empty cdroms, audiocd in video menu, ...
+ dir_types = {
+ 'audio': [ 'dir', 'audiocd' ],
+ 'video': [ 'dir', 'video', 'vcd', 'dvd' ],
+ 'image': [ 'dir' ],
+ 'mame' : [ 'dir' ],
+ }
+
#
# Plugin interface to integrate the MediaMenu into Freevo
***************
*** 133,142 ****
if self.display_type:
! plugins = plugin.get('mainmenu_%s' % self.display_type)
else:
! plugins = []
! for p in plugins:
! items += p.items(self)
return items
--- 151,170 ----
if self.display_type:
! plugins_list = plugin.get('mainmenu_%s' % self.display_type)
else:
! plugins_list = []
! dir_type = dir_types.get( self.display_type, [ ] )
!
! for p in plugins_list:
!
! if isinstance( p, plugins.rom_drives.rom_items ):
! # do not show empty rom drives and media from other menus
! l = p.items( self )
! for i in l:
! if i.type and i.type in dir_type:
! items += [ i ]
! else:
! items += p.items( self )
return items
***************
*** 216,220 ****
menuw.menustack[1].choices = self.main_menu_generate()
if not menu.selected in menu.choices:
! menu.selected = menu.choices[sel]
if menu == menuw.menustack[-1] and not rc.app():
--- 244,253 ----
menuw.menustack[1].choices = self.main_menu_generate()
if not menu.selected in menu.choices:
! if len( menu.choices ) > sel:
! menu.selected = menu.choices[sel]
! elif menu.choices:
! menu.selected = menu.choices[ -1 ]
! else:
! menu.selected = None
if menu == menuw.menustack[-1] and not rc.app():
Index: rom_drives.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** rom_drives.py 20 Aug 2003 21:51:34 -0000 1.18
--- rom_drives.py 21 Aug 2003 20:54:44 -0000 1.19
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.19 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.18 2003/08/20 21:51:34 outlyer
# Use Python 'touch' rather than system call
***************
*** 146,150 ****
"""
global im_thread
!
# if we are at the main menu and there is an IDENTIFY_MEDIA event,
# try to autorun the media
--- 154,158 ----
"""
global im_thread
!
# if we are at the main menu and there is an IDENTIFY_MEDIA event,
# try to autorun the media
***************
*** 615,619 ****
if xml_file:
media.videoinfo.xml_file = xml_file
!
media.info.media = media
return
--- 623,627 ----
if xml_file:
media.videoinfo.xml_file = xml_file
!
media.info.media = media
return
-------------------------------------------------------
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
