Update of /cvsroot/freevo/freevo/src/audio In directory sc8-pr-cvs1:/tmp/cvs-serv24051/src/audio
Modified Files: audiodiskitem.py Log Message: merged Playlist and RandomPlaylist into one class Index: audiodiskitem.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/audio/audiodiskitem.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** audiodiskitem.py 8 Nov 2003 12:58:41 -0000 1.24 --- audiodiskitem.py 8 Dec 2003 20:37:34 -0000 1.25 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.25 2003/12/08 20:37:34 dischi + # merged Playlist and RandomPlaylist into one class + # # Revision 1.24 2003/11/08 12:58:41 dischi # better support for mixed discs *************** *** 51,55 **** from item import Item from audioitem import AudioItem ! from playlist import Playlist, RandomPlaylist from directory import DirItem --- 54,58 ---- from item import Item from audioitem import AudioItem ! from playlist import Playlist from directory import DirItem *************** *** 60,64 **** def __init__(self, disc_id, parent, devicename = None, display_type = None): ! Item.__init__(self, parent) self.type = 'audiocd' self.media = None --- 63,67 ---- def __init__(self, disc_id, parent, devicename = None, display_type = None): ! Playlist.__init__(self, parent=parent) self.type = 'audiocd' self.media = None *************** *** 68,73 **** # variables only for Playlist - self.current_item = 0 - self.playlist = [] self.autoplay = 0 --- 71,74 ---- *************** *** 137,144 **** # random playlist (only active for audio) ! if len(play_items) > 1 and config.AUDIO_RANDOM_PLAYLIST == 1: ! pl = Playlist(play_items, self) ! pl.randomize() ! pl.autoplay = 1 items += [ pl ] --- 138,144 ---- # random playlist (only active for audio) ! if 'audio' in self.DIRECTORY_ADD_RANDOM_PLAYLIST and len(play_items) > 1: ! pl = Playlist(_('Random playlist'), play_items, self, random=True) ! pl.autoplay = True items += [ pl ] ------------------------------------------------------- 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