Author: duncan
Date: Tue Feb 19 08:19:10 2008
New Revision: 10378
Log:
Renaming of possible_player to possible_players as it is a list
Modified:
branches/rel-1-7/freevo/src/audio/player.py
branches/rel-1-7/freevo/src/video/configure.py
branches/rel-1/freevo/src/audio/player.py
branches/rel-1/freevo/src/video/configure.py
Modified: branches/rel-1-7/freevo/src/audio/player.py
==============================================================================
--- branches/rel-1-7/freevo/src/audio/player.py (original)
+++ branches/rel-1-7/freevo/src/audio/player.py Tue Feb 19 08:19:10 2008
@@ -72,7 +72,7 @@
self.player = player
else:
- self.possible_player = []
+ self.possible_players = []
for p in plugin.getbyname(plugin.AUDIO_PLAYER, True):
rating = p.rate(self.item) * 10
if config.AUDIO_PREFERED_PLAYER == p.name:
@@ -81,9 +81,9 @@
if hasattr(self.item, 'force_player') and p.name ==
self.item.force_player:
rating += 100
- self.possible_player.append((rating, p))
- self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
- self.player = self.possible_player[0][1]
+ self.possible_players.append((rating, p))
+ self.possible_players.sort(lambda l, o: -cmp(l[0], o[0]))
+ self.player = self.possible_players[0][1]
if self.menuw and self.menuw.visible:
self.menuw.hide(clear=False)
@@ -108,7 +108,7 @@
_debug_('error, try next player')
player = None
next = False
- for r, p in self.possible_player:
+ for r, p in self.possible_players:
if next:
player = p
break
Modified: branches/rel-1-7/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/configure.py (original)
+++ branches/rel-1-7/freevo/src/video/configure.py Tue Feb 19 08:19:10 2008
@@ -195,9 +195,8 @@
item = arg
menu_items = []
- for player in item.possible_player:
- menu_items += [ menu.MenuItem(_('Play with "%s"') % (player[1].name),
- player_selection, (arg, player))]
+ for player in item.possible_players:
+ menu_items += [ menu.MenuItem(_('Play with "%s"') % (player[1].name),
player_selection, (arg, player))]
moviemenu = menu.Menu(_('Player Menu'), menu_items, fxd_file=item.skin_fxd)
menuw.pushmenu(moviemenu)
@@ -272,19 +271,16 @@
next_start = 0
items = []
- if len(item.possible_player) >1:
- items.append(menu.MenuItem(_('Play with alternate player'),
- player_selection_menu, item))
+ if len(item.possible_players) > 1:
+ items.append(menu.MenuItem(_('Play with alternate player'),
player_selection_menu, item))
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'),
- subtitle_selection_menu, item))
+ items.append(menu.MenuItem(_('Subtitle selection'),
subtitle_selection_menu, item))
if item.info.has_key('chapters') and item.info['chapters'] > 1:
- items.append(menu.MenuItem(_('Chapter selection'),
- chapter_selection_menu, item))
+ items.append(menu.MenuItem(_('Chapter selection'),
chapter_selection_menu, item))
if item.subitems:
# show subitems as chapter
items.append(menu.MenuItem(_('Chapter selection'),
Modified: branches/rel-1/freevo/src/audio/player.py
==============================================================================
--- branches/rel-1/freevo/src/audio/player.py (original)
+++ branches/rel-1/freevo/src/audio/player.py Tue Feb 19 08:19:10 2008
@@ -72,7 +72,7 @@
self.player = player
else:
- self.possible_player = []
+ self.possible_players = []
for p in plugin.getbyname(plugin.AUDIO_PLAYER, True):
rating = p.rate(self.item) * 10
if config.AUDIO_PREFERED_PLAYER == p.name:
@@ -81,9 +81,9 @@
if hasattr(self.item, 'force_player') and p.name ==
self.item.force_player:
rating += 100
- self.possible_player.append((rating, p))
- self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
- self.player = self.possible_player[0][1]
+ self.possible_players.append((rating, p))
+ self.possible_players.sort(lambda l, o: -cmp(l[0], o[0]))
+ self.player = self.possible_players[0][1]
if self.menuw and self.menuw.visible:
self.menuw.hide(clear=False)
@@ -108,7 +108,7 @@
_debug_('error, try next player')
player = None
next = False
- for r, p in self.possible_player:
+ for r, p in self.possible_players:
if next:
player = p
break
Modified: branches/rel-1/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1/freevo/src/video/configure.py (original)
+++ branches/rel-1/freevo/src/video/configure.py Tue Feb 19 08:19:10 2008
@@ -195,9 +195,8 @@
item = arg
menu_items = []
- for player in item.possible_player:
- menu_items += [ menu.MenuItem(_('Play with "%s"') % (player[1].name),
- player_selection, (arg, player))]
+ for player in item.possible_players:
+ menu_items += [ menu.MenuItem(_('Play with "%s"') % (player[1].name),
player_selection, (arg, player))]
moviemenu = menu.Menu(_('Player Menu'), menu_items, fxd_file=item.skin_fxd)
menuw.pushmenu(moviemenu)
@@ -272,19 +271,15 @@
next_start = 0
items = []
- if len(item.possible_player) >1:
- items.append(menu.MenuItem(_('Play with alternate player'),
- player_selection_menu, item))
-
if item.filename or (item.mode in ('dvd', 'vcd') and item.player_rating >=
20):
+ if len(item.possible_players) > 1:
+ items.append(menu.MenuItem(_('Play with alternate player'),
player_selection_menu, item))
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'),
- subtitle_selection_menu, item))
+ items.append(menu.MenuItem(_('Subtitle selection'),
subtitle_selection_menu, item))
if item.info.has_key('chapters') and item.info['chapters'] > 1:
- items.append(menu.MenuItem(_('Chapter selection'),
- chapter_selection_menu, item))
+ items.append(menu.MenuItem(_('Chapter selection'),
chapter_selection_menu, item))
if item.subitems:
# show subitems as chapter
items.append(menu.MenuItem(_('Chapter selection'),
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
