Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20634/video
Modified Files:
configure.py
Log Message:
o file cleanup
o add doc
o fix crash when calling init_page (this function is gone now)
Index: configure.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/configure.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** configure.py 28 Aug 2004 17:17:35 -0000 1.29
--- configure.py 18 Dec 2004 18:10:12 -0000 1.30
***************
*** 1,37 ****
# -*- coding: iso-8859-1 -*-
! # -----------------------------------------------------------------------
# configure.py - Configure video playing
! # -----------------------------------------------------------------------
# $Id$
#
- # Notes: Not integrated right now
- # Todo: Fix some stuff, wait for the mplayer people what they are doing
- #
- # -----------------------------------------------------------------------
- # $Log$
- # Revision 1.29 2004/08/28 17:17:35 dischi
- # use chapter selection to select file for multi file videos
- #
- # Revision 1.28 2004/08/24 16:42:44 dischi
- # Made the fxdsettings in gui the theme engine and made a better
- # integration for it. There is also an event now to let the plugins
- # know that the theme is changed.
#
! # Revision 1.27 2004/07/10 12:33:43 dischi
! # header cleanup
! #
! # Revision 1.26 2004/05/28 15:50:27 dischi
! # configure menu items cleanup
! # support chapters as ChapterInfo in mmpython (e.g. ogm files)
! #
! # Revision 1.25 2004/05/06 18:12:17 dischi
! # fix crash
#
! # Revision 1.24 2004/03/13 23:44:02 dischi
! # audio stream selection fixes
#
- # -----------------------------------------------------------------------
- # Freevo - A Home Theater PC framework
- # Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
--- 1,16 ----
# -*- coding: iso-8859-1 -*-
! #
-----------------------------------------------------------------------------
# configure.py - Configure video playing
! #
-----------------------------------------------------------------------------
# $Id$
#
#
! #
-----------------------------------------------------------------------------
! # Freevo - A Home Theater PC framework
! # Copyright (C) 2002-2004 Krister Lagerstrom, Dirk Meyer, et al.
#
! # First Edition: Dirk Meyer <[EMAIL PROTECTED]>
! # Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
***************
*** 50,63 ****
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
! # ----------------------------------------------------------------------- */
! # The menu widget class
import menu
import plugin
- # RegExp
- import re
-
#
--- 29,41 ----
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
! #
-----------------------------------------------------------------------------
+ # python imports
+ import re
! # freevo imports
import menu
import plugin
#
***************
*** 66,69 ****
--- 44,50 ----
def play_movie(arg=None, menuw=None):
+ """
+ play the movie (again)
+ """
menuw.delete_menu()
arg[0].play(menuw=menuw, arg=arg[1])
***************
*** 76,84 ****
def audio_selection(arg=None, menuw=None):
arg[0].selected_audio = arg[1]
menuw.back_one_menu()
def audio_selection_menu(arg=None, menuw=None):
! item = arg
menu_items = []
--- 57,72 ----
def audio_selection(arg=None, menuw=None):
+ """
+ Handle audio selection.
+ """
arg[0].selected_audio = arg[1]
menuw.back_one_menu()
+
def audio_selection_menu(arg=None, menuw=None):
! """
! Submenu for audio selection.
! """
! item = arg
menu_items = []
***************
*** 86,90 ****
if not a.has_key('id') or a['id'] in ('', None):
a['id'] = item.info['audio'].index(a) + 1
!
if not a.has_key('language') or not a['language']:
a['language'] = _('Stream %s') % a['id']
--- 74,78 ----
if not a.has_key('id') or a['id'] in ('', None):
a['id'] = item.info['audio'].index(a) + 1
!
if not a.has_key('language') or not a['language']:
a['language'] = _('Stream %s') % a['id']
***************
*** 98,102 ****
moviemenu = menu.Menu(_('Audio Menu'), menu_items, theme=item.skin_fxd)
menuw.pushmenu(moviemenu)
!
#
--- 86,90 ----
moviemenu = menu.Menu(_('Audio Menu'), menu_items, theme=item.skin_fxd)
menuw.pushmenu(moviemenu)
!
#
***************
*** 105,115 ****
def subtitle_selection(arg=None, menuw=None):
arg[0].selected_subtitle = arg[1]
menuw.back_one_menu()
def subtitle_selection_menu(arg=None, menuw=None):
! item = arg
!
! menu_items = [ menu.MenuItem(_('no subtitles'), subtitle_selection,
(item, -1)) ]
for s in range(len(item.info['subtitles'])):
menu_items.append(menu.MenuItem(item.info['subtitles'][s],
--- 93,109 ----
def subtitle_selection(arg=None, menuw=None):
+ """
+ Handle subtitle selection.
+ """
arg[0].selected_subtitle = arg[1]
menuw.back_one_menu()
def subtitle_selection_menu(arg=None, menuw=None):
! """
! Submenu for subtitle selection.
! """
! item = arg
! menu_items = [ menu.MenuItem(_('no subtitles'), subtitle_selection,
! (item, -1)) ]
for s in range(len(item.info['subtitles'])):
menu_items.append(menu.MenuItem(item.info['subtitles'][s],
***************
*** 118,122 ****
menuw.pushmenu(moviemenu)
!
#
# Chapter selection
--- 112,116 ----
menuw.pushmenu(moviemenu)
!
#
# Chapter selection
***************
*** 124,136 ****
def chapter_selection(menuw=None, arg=None):
menuw.delete_menu()
play_movie(menuw=menuw, arg=arg)
!
def chapter_selection_menu(arg=None, menuw=None):
item = arg
menu_items = []
if isinstance(arg.info['chapters'], int):
for c in range(1, arg.info['chapters']):
! menu_items += [ menu.MenuItem(_('Play chapter %s') % c,
chapter_selection,
(arg, ' -chapter %s' % c)) ]
elif arg.info['chapters']:
--- 118,137 ----
def chapter_selection(menuw=None, arg=None):
+ """
+ Handle chapter selection.
+ """
menuw.delete_menu()
play_movie(menuw=menuw, arg=arg)
!
def chapter_selection_menu(arg=None, menuw=None):
+ """
+ Submenu for chapter selection.
+ """
item = arg
menu_items = []
if isinstance(arg.info['chapters'], int):
for c in range(1, arg.info['chapters']):
! menu_items += [ menu.MenuItem(_('Play chapter %s') % c,
! chapter_selection,
(arg, ' -chapter %s' % c)) ]
elif arg.info['chapters']:
***************
*** 138,142 ****
menu_items += [ menu.MenuItem(c.name, chapter_selection,
(arg, ' -ss %s' % c.pos)) ]
!
moviemenu = menu.Menu(_('Chapter Menu'), menu_items, theme=item.skin_fxd)
menuw.pushmenu(moviemenu)
--- 139,143 ----
menu_items += [ menu.MenuItem(c.name, chapter_selection,
(arg, ' -ss %s' % c.pos)) ]
!
moviemenu = menu.Menu(_('Chapter Menu'), menu_items, theme=item.skin_fxd)
menuw.pushmenu(moviemenu)
***************
*** 148,166 ****
def subitem_selection(menuw=None, arg=None):
item, pos = arg
item.conf_select_this_item = item.subitems[pos]
menuw.delete_menu()
play_movie(menuw=menuw, arg=(item, None))
!
def subitem_selection_menu(arg=None, menuw=None):
item = arg
menu_items = []
-
for pos in range(len(item.subitems)):
menu_items += [ menu.MenuItem(_('Play chapter %s') % (pos+1),
subitem_selection, (arg, pos)) ]
!
! moviemenu = menu.Menu(_('Chapter Menu'), menu_items,
fxd_file=item.skin_fxd)
menuw.pushmenu(moviemenu)
--- 149,172 ----
def subitem_selection(menuw=None, arg=None):
+ """
+ Handle subitem selection.
+ """
item, pos = arg
item.conf_select_this_item = item.subitems[pos]
menuw.delete_menu()
play_movie(menuw=menuw, arg=(item, None))
!
def subitem_selection_menu(arg=None, menuw=None):
+ """
+ Submenu for subitem selection.
+ """
item = arg
menu_items = []
for pos in range(len(item.subitems)):
menu_items += [ menu.MenuItem(_('Play chapter %s') % (pos+1),
subitem_selection, (arg, pos)) ]
! moviemenu = menu.Menu(_('Chapter Menu'), menu_items,
! fxd_file=item.skin_fxd)
menuw.pushmenu(moviemenu)
***************
*** 171,174 ****
--- 177,183 ----
def toggle(arg=None, menuw=None):
+ """
+ Basic toggle function.
+ """
arg[1][arg[2]] = not arg[1][arg[2]]
***************
*** 185,198 ****
menuw.menustack[-1].selected = menuw.menustack[-1].choices[pos]
- menuw.init_page()
menuw.refresh()
def add_toogle(name, item, var):
if item[var]:
! return menu.MenuItem(_('Turn off %s') % name, toggle, (name, item,
var))
return menu.MenuItem(_('Turn on %s') % name, toggle, (name, item, var))
!
#
# config main menu
--- 194,212 ----
menuw.menustack[-1].selected = menuw.menustack[-1].choices[pos]
menuw.refresh()
def add_toogle(name, item, var):
+ """
+ Add a 'toggle' item.
+ """
if item[var]:
! return menu.MenuItem(_('Turn off %s') % name, toggle,
! (name, item, var))
return menu.MenuItem(_('Turn on %s') % name, toggle, (name, item, var))
!
!
!
#
# config main menu
***************
*** 200,210 ****
def get_items(item):
next_start = 0
items = []
print item.subitems
! if item.filename or (item.mode in ('dvd', 'vcd') and item.player_rating
>= 20):
if item.info.has_key('audio') and len(item.info['audio']) > 1:
! items.append(menu.MenuItem(_('Audio selection'),
audio_selection_menu, item))
if item.info.has_key('subtitles') and len(item.info['subtitles']) > 1:
items.append(menu.MenuItem(_('Subtitle selection'),
--- 214,229 ----
def get_items(item):
+ """
+ Return possible configure items.
+ """
next_start = 0
items = []
print item.subitems
! if item.filename or (item.mode in ('dvd', 'vcd') and \
! item.player_rating >= 20):
if item.info.has_key('audio') and len(item.info['audio']) > 1:
! items.append(menu.MenuItem(_('Audio selection'),
! audio_selection_menu, item))
if item.info.has_key('subtitles') and len(item.info['subtitles']) > 1:
items.append(menu.MenuItem(_('Subtitle selection'),
***************
*** 217,230 ****
items.append(menu.MenuItem(_('Chapter selection'),
subitem_selection_menu, item))
!
if item.mode in ('dvd', 'vcd') or \
(item.filename and item.info.has_key('type') and \
! item.info['type'] and item.info['type'].lower().find('mpeg') !=
-1):
items += [ add_toogle(_('deinterlacing'), item, 'deinterlace') ]
return items
!
def get_menu(item, menuw):
! items = get_items(item) + [ menu.MenuItem(_('Play'), play_movie, (item,
'')) ]
return menu.Menu(_('Config Menu'), items, theme=item.skin_fxd)
!
--- 236,254 ----
items.append(menu.MenuItem(_('Chapter selection'),
subitem_selection_menu, item))
!
if item.mode in ('dvd', 'vcd') or \
(item.filename and item.info.has_key('type') and \
! item.info['type'] and \
! item.info['type'].lower().find('mpeg') != -1):
items += [ add_toogle(_('deinterlacing'), item, 'deinterlace') ]
return items
!
def get_menu(item, menuw):
! """
! Return a complete menu for configure options.
! """
! items = get_items(item) + [ menu.MenuItem(_('Play'), play_movie,
! (item, '')) ]
return menu.Menu(_('Config Menu'), items, theme=item.skin_fxd)
!
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
