Author: duncan
Date: Sun Mar 16 18:10:29 2008
New Revision: 10538
Log:
[ 1910529 ] Mplayer/Xine listed twice in the "alternative player" menu
Fix applied to both audio and video
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/audio/player.py
branches/rel-1-7/freevo/src/video/plugins/youtube.py
branches/rel-1-7/freevo/src/video/videoitem.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/audio/player.py
branches/rel-1/freevo/src/video/videoitem.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Sun Mar 16 18:10:29 2008
@@ -38,6 +38,7 @@
* Fixed moviecovers plug-in proceeding when unzip is not installed (B#1903519)
* Fixed rom_drives plug-in crashing when toggling the eject/close drive
(B#1890647)
* Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
+ * Fixed video alternative player being shown twice (B#1910529)
* Fixed web servers encoding interface (B#1885914)
* Fixed web servers image pop-up encoding (B#1895302)
* Fixed web servers remote image locations (B#1900736)
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 Sun Mar 16 18:10:29 2008
@@ -81,9 +81,12 @@
if hasattr(self.item, 'force_player') and p.name ==
self.item.force_player:
rating += 100
- self.possible_players.append((rating, p))
+ if (rating, p) not in self.possible_players:
+ self.possible_players += [(rating, p)]
+ self.possible_players = filter(lambda l: l[0] > 0,
self.possible_players)
self.possible_players.sort(lambda l, o: -cmp(l[0], o[0]))
- self.player = self.possible_players[0][1]
+ if len(self.possible_players) > 0:
+ self.player_rating, self.player = self.possible_players[0]
if self.menuw and self.menuw.visible:
self.menuw.hide(clear=False)
Modified: branches/rel-1-7/freevo/src/video/plugins/youtube.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/youtube.py (original)
+++ branches/rel-1-7/freevo/src/video/plugins/youtube.py Sun Mar 16
18:10:29 2008
@@ -221,7 +221,7 @@
elif video.link[0].href.find('watch?v=') >= 0:
id = video.link[0].href.split('watch?v=');
else:
- continue
+ continue
mi = menu.MenuItem(date[0] + ' ' + video.title.text,
parent.downloadvideo, id[1])
mi.arg = (video.title.text, id[1])
text = util.htmlenties2txt(video.content)
Modified: branches/rel-1-7/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/videoitem.py (original)
+++ branches/rel-1-7/freevo/src/video/videoitem.py Sun Mar 16 18:10:29 2008
@@ -198,13 +198,14 @@
if hasattr(self, 'force_player') and p.name == self.force_player:
rating += 100
if (rating, p) not in self.possible_players:
- self.possible_players.append((rating, p))
+ self.possible_players += [(rating, p)]
+ self.possible_players = filter(lambda l: l[0] > 0,
self.possible_players)
# sort the players in the order of the rating
self.possible_players.sort(lambda l, o: -cmp(l[0], o[0]))
if len(self.possible_players) > 0:
# choose the best player as default player
self.player_rating, self.player = self.possible_players[0]
- _debug_("url=%r possible_players=%r" % (self.url,
self.possible_players,), 2)
+ _debug_("url=%r possible_players=%r" % (self.url,
self.possible_players,), 1)
def id(self):
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sun Mar 16 18:10:29 2008
@@ -42,6 +42,7 @@
* Fixed ivtv_xine_tv plug-in encoding of OSD messages (B#1893373)
* Fixed moviecovers plug-in proceeding when unzip is not installed (B#1903519)
* Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
+ * Fixed video alternative player being shown twice (B#1910529)
* Fixed web servers encoding interface (B#1885914)
* Fixed web servers image pop-up encoding (B#1895302)
* Fixed web servers remote image locations (B#1900736)
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 Sun Mar 16 18:10:29 2008
@@ -81,9 +81,12 @@
if hasattr(self.item, 'force_player') and p.name ==
self.item.force_player:
rating += 100
- self.possible_players.append((rating, p))
+ if (rating, p) not in self.possible_players:
+ self.possible_players += [(rating, p)]
+ self.possible_players = filter(lambda l: l[0] > 0,
self.possible_players)
self.possible_players.sort(lambda l, o: -cmp(l[0], o[0]))
- self.player = self.possible_players[0][1]
+ if len(self.possible_players) > 0:
+ self.player_rating, self.player = self.possible_players[0]
if self.menuw and self.menuw.visible:
self.menuw.hide(clear=False)
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Sun Mar 16 18:10:29 2008
@@ -198,13 +198,14 @@
if hasattr(self, 'force_player') and p.name == self.force_player:
rating += 100
if (rating, p) not in self.possible_players:
- self.possible_players.append((rating, p))
+ self.possible_players += [(rating, p)]
+ self.possible_players = filter(lambda l: l[0] > 0,
self.possible_players)
# sort the players in the order of the rating
self.possible_players.sort(lambda l, o: -cmp(l[0], o[0]))
if len(self.possible_players) > 0:
# choose the best player as default player
self.player_rating, self.player = self.possible_players[0]
- _debug_("url=%r possible_players=%r" % (self.url,
self.possible_players,), 2)
+ _debug_("url=%r possible_players=%r" % (self.url,
self.possible_players,), 1)
def id(self):
-------------------------------------------------------------------------
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
