Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6788
Modified Files:
playlist.py
Log Message:
send event if there is not next playlist event
Index: playlist.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/playlist.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** playlist.py 22 Oct 2003 17:22:36 -0000 1.32
--- playlist.py 21 Nov 2003 11:43:58 -0000 1.33
***************
*** 10,39 ****
# -----------------------------------------------------------------------
# $Log$
! # Revision 1.32 2003/10/22 17:22:36 dischi
! # better stop() exception handling
! #
! # Revision 1.31 2003/10/21 21:17:41 gsbarbieri
! # Some more i18n improvements.
! #
! # Revision 1.30 2003/10/18 17:56:28 dischi
! # ignore next/prev track request on OSError
! #
! # Revision 1.29 2003/10/18 08:13:35 dischi
! # add recursive _not_ random playlist
! #
! # Revision 1.28 2003/10/17 18:50:10 dischi
! # random playlist can now be non-recursive, too
! #
! # Revision 1.27 2003/10/17 17:29:03 dischi
! # do not include games in playlist
! #
! # Revision 1.26 2003/10/04 18:37:29 dischi
! # i18n changes and True/False usage
! #
! # Revision 1.25 2003/09/19 22:07:15 dischi
! # TRUE/True/FALSE/False changes
#
- # Revision 1.24 2003/09/14 20:09:36 dischi
- # removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
#
# -----------------------------------------------------------------------
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
! # Revision 1.33 2003/11/21 11:43:58 dischi
! # send event if there is not next playlist event
#
#
# -----------------------------------------------------------------------
***************
*** 66,70 ****
import util
import config
! import event as em
from item import Item
--- 43,48 ----
import util
import config
! from event import *
! import rc
from item import Item
***************
*** 305,309 ****
menuw = self.menuw
! if event in ( em.PLAYLIST_NEXT, em.PLAY_END, em.USER_END) \
and self.current_item and self.playlist:
pos = self.playlist.index(self.current_item)
--- 283,287 ----
menuw = self.menuw
! if event in ( PLAYLIST_NEXT, PLAY_END, USER_END) \
and self.current_item and self.playlist:
pos = self.playlist.index(self.current_item)
***************
*** 320,326 ****
self.play(menuw=menuw, arg='next')
return True
!
# end and no next item
! if event in (em.PLAY_END, em.USER_END, em.STOP):
self.current_item = None
if menuw:
--- 298,306 ----
self.play(menuw=menuw, arg='next')
return True
! elif event == PLAYLIST_NEXT:
! rc.post_event(Event(OSD_MESSAGE, arg=_('no next item in playlist')))
!
# end and no next item
! if event in (PLAY_END, USER_END, STOP):
self.current_item = None
if menuw:
***************
*** 329,333 ****
! if event == em.PLAYLIST_PREV and self.current_item and self.playlist:
pos = self.playlist.index(self.current_item)
if pos:
--- 309,313 ----
! if event == PLAYLIST_PREV and self.current_item and self.playlist:
pos = self.playlist.index(self.current_item)
if pos:
***************
*** 342,345 ****
--- 322,327 ----
self.play(menuw=menuw, arg='next')
return True
+ else:
+ rc.post_event(Event(OSD_MESSAGE, arg=_('no previous item in
playlist')))
# give the event to the next eventhandler in the list
***************
*** 420,424 ****
menuw = self.menuw
! if (event == em.PLAYLIST_NEXT or event == em.PLAY_END) and self.unplayed:
if self.current_item:
self.current_item.parent = self.parent
--- 402,406 ----
menuw = self.menuw
! if (event == PLAYLIST_NEXT or event == PLAY_END) and self.unplayed:
if self.current_item:
self.current_item.parent = self.parent
***************
*** 432,436 ****
# end and no next item
! if event == em.PLAY_END:
if self.current_item:
self.current_item.parent = self.parent
--- 414,418 ----
# end and no next item
! if event == PLAY_END:
if self.current_item:
self.current_item.parent = self.parent
***************
*** 440,444 ****
return True
! if event == em.PLAYLIST_PREV:
print 'random playlist up: not implemented yet'
--- 422,426 ----
return True
! if event == PLAYLIST_PREV:
print 'random playlist up: not implemented yet'
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
