Update of /cvsroot/freevo/freevo/src/audio
In directory sc8-pr-cvs1:/tmp/cvs-serv8165
Modified Files:
audiodiskitem.py audioitem.py player.py
Log Message:
cleanup
Index: audiodiskitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/audiodiskitem.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** audiodiskitem.py 13 Sep 2003 10:08:21 -0000 1.21
--- audiodiskitem.py 20 Sep 2003 09:44:23 -0000 1.22
***************
*** 10,20 ****
# -----------------------------------------------------------------------
# $Log$
# Revision 1.21 2003/09/13 10:08:21 dischi
# i18n support
#
- # Revision 1.20 2003/08/23 12:51:41 dischi
- # removed some old CVS log messages
- #
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 10,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.22 2003/09/20 09:44:23 dischi
+ # cleanup
+ #
# Revision 1.21 2003/09/13 10:08:21 dischi
# i18n support
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
***************
*** 48,54 ****
from playlist import Playlist, RandomPlaylist
- TRUE = 1
- FALSE = 0
-
class AudioDiskItem(Playlist):
"""
--- 47,50 ----
***************
*** 108,112 ****
for i in range(0, len(self.info['tracks'])):
title=self.info['tracks'][i]['title']
! item = AudioItem('cdda://%d' % (i+1), self, title, scan=FALSE)
# XXX FIXME: set also all the other infos here if AudioInfo
--- 104,108 ----
for i in range(0, len(self.info['tracks'])):
title=self.info['tracks'][i]['title']
! item = AudioItem('cdda://%d' % (i+1), self, title, scan=False)
# XXX FIXME: set also all the other infos here if AudioInfo
Index: audioitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/audioitem.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** audioitem.py 10 Sep 2003 19:35:49 -0000 1.35
--- audioitem.py 20 Sep 2003 09:44:23 -0000 1.36
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.36 2003/09/20 09:44:23 dischi
+ # cleanup
+ #
# Revision 1.35 2003/09/10 19:35:49 dischi
# fix length during runtime
***************
*** 57,65 ****
- DEBUG = config.DEBUG
-
- TRUE = 1
- FALSE = 0
-
class AudioItem(Item):
"""
--- 60,63 ----
***************
*** 67,71 ****
"""
! def __init__(self, file, parent, name = None, scan = TRUE):
if scan:
if parent and parent.media:
--- 65,69 ----
"""
! def __init__(self, file, parent, name = None, scan = True):
if scan:
if parent and parent.media:
Index: player.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/player.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** player.py 15 Sep 2003 20:06:02 -0000 1.6
--- player.py 20 Sep 2003 09:44:23 -0000 1.7
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2003/09/20 09:44:23 dischi
+ # cleanup
+ #
# Revision 1.6 2003/09/15 20:06:02 dischi
# error handling when mplayer does not start
***************
*** 60,65 ****
skin = skin.get_singleton()
- TRUE = 1
- FALSE = 0
class PlayerGUI(GUIObject):
--- 63,66 ----
***************
*** 67,73 ****
GUIObject.__init__(self)
if menuw:
! self.visible = TRUE
else:
! self.visible = FALSE
self.menuw = menuw
--- 68,74 ----
GUIObject.__init__(self)
if menuw:
! self.visible = True
else:
! self.visible = False
self.menuw = menuw
***************
*** 77,81 ****
else:
self.player = plugin.getbyname(plugin.AUDIO_PLAYER)
! self.running = FALSE
def play(self):
--- 78,82 ----
else:
self.player = plugin.getbyname(plugin.AUDIO_PLAYER)
! self.running = False
def play(self):
***************
*** 86,94 ****
self.menuw.hide()
! self.running = TRUE
error = self.player.play(self.item, self)
if error:
print error
! self.running = FALSE
if self.visible:
rc.app(None)
--- 87,95 ----
self.menuw.hide()
! self.running = True
error = self.player.play(self.item, self)
if error:
print error
! self.running = False
if self.visible:
rc.app(None)
***************
*** 102,106 ****
def stop(self):
self.player.stop()
! self.running = FALSE
if self.visible:
rc.app(None)
--- 103,107 ----
def stop(self):
self.player.stop()
! self.running = False
if self.visible:
rc.app(None)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
