Author: duncan
Date: Mon Mar 17 09:54:26 2008
New Revision: 10545
Log:
[ 1910749 ] Crash When using Show Lyrics
Fix applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/playlist.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/playlist.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Mon Mar 17 09:54:26 2008
@@ -30,6 +30,7 @@
* Updated tv program to stop reporting that a program is over (F#1886568)
* Updated xml tv epg to allow a time zone to be specified (F#1889376)
* Updated youtube video plug-in to look up two links (F#1890214)
+ * Fixed audio playlist when the end of the play list has been reached
(B#1910749)
* Fixed audio selection for avi video files with more than one audio
(B#1911247)
* Fixed audio selection for the first track for mkv and ogm video files
(B#1890498)
* Fixed audioscrobbler plug-in not sending songs to last.fm (B#1902461)
Modified: branches/rel-1-7/freevo/src/playlist.py
==============================================================================
--- branches/rel-1-7/freevo/src/playlist.py (original)
+++ branches/rel-1-7/freevo/src/playlist.py Mon Mar 17 09:54:26 2008
@@ -468,10 +468,12 @@
else:
rc.post_event(Event(OSD_MESSAGE, arg=_('playlist repeat off')))
- if event in ( PLAYLIST_NEXT, PLAY_END, USER_END) \
- and self.current_item and self.playlist:
- pos = self.playlist.index(self.current_item)
- pos = (pos+1) % len(self.playlist)
+ if event in (PLAYLIST_NEXT, PLAY_END, USER_END) and self.current_item
and self.playlist:
+ try:
+ pos = self.playlist.index(self.current_item)
+ pos = (pos+1) % len(self.playlist)
+ except ValueError:
+ return True
if pos or self.repeat:
if hasattr(self.current_item, 'stop'):
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Mon Mar 17 09:54:26 2008
@@ -35,6 +35,7 @@
* Updated tv program to stop reporting that a program is over (F#1886568)
* Updated xml tv epg to allow a time zone to be specified (F#1889376)
* Updated youtube video plug-in to look up two links (F#1890214)
+ * Fixed audio playlist when the end of the play list has been reached
(B#1910749)
* Fixed audio selection for avi video files with more than one audio
(B#1911247)
* Fixed audio selection for the first track for mkv and ogm video files
(B#1890498)
* Fixed audioscrobbler plug-in not sending songs to last.fm (B#1902461)
Modified: branches/rel-1/freevo/src/playlist.py
==============================================================================
--- branches/rel-1/freevo/src/playlist.py (original)
+++ branches/rel-1/freevo/src/playlist.py Mon Mar 17 09:54:26 2008
@@ -468,10 +468,12 @@
else:
rc.post_event(Event(OSD_MESSAGE, arg=_('playlist repeat off')))
- if event in ( PLAYLIST_NEXT, PLAY_END, USER_END) \
- and self.current_item and self.playlist:
- pos = self.playlist.index(self.current_item)
- pos = (pos+1) % len(self.playlist)
+ if event in (PLAYLIST_NEXT, PLAY_END, USER_END) and self.current_item
and self.playlist:
+ try:
+ pos = self.playlist.index(self.current_item)
+ pos = (pos+1) % len(self.playlist)
+ except ValueError:
+ return True
if pos or self.repeat:
if hasattr(self.current_item, 'stop'):
-------------------------------------------------------------------------
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
