Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30417
Modified Files:
cleanup.py
Log Message:
wait using the notifier, stop popen children
Index: cleanup.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/cleanup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cleanup.py 20 Nov 2004 18:22:58 -0000 1.3
--- cleanup.py 18 Dec 2004 13:39:08 -0000 1.4
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2004/12/18 13:39:08 dischi
+ # wait using the notifier, stop popen children
+ #
# Revision 1.3 2004/11/20 18:22:58 dischi
# use python logger module for debug
***************
*** 44,48 ****
import time
import sys
!
import config
--- 47,52 ----
import time
import sys
! import copy
! import notifier
import config
***************
*** 73,76 ****
--- 77,81 ----
else only Freevo will be stopped.
"""
+ import util.popen
import util.mediainfo
import gui
***************
*** 105,108 ****
--- 110,114 ----
log.debug('shutting down %s' % c[ 0 ])
c[ 0 ]( *c[ 1 ] )
+ util.popen.killall()
_callbacks = []
gui.displays.shutdown()
***************
*** 113,118 ****
os.system(config.RESTART_SYS_CMD)
# let freevo be killed by init, looks nicer for mga
! while 1:
! time.sleep(1)
return
--- 119,123 ----
os.system(config.RESTART_SYS_CMD)
# let freevo be killed by init, looks nicer for mga
! notifier.loop()
return
***************
*** 120,129 ****
# Exit Freevo
#
!
# Shutdown all children still running
! for c in _callbacks:
log.debug( 'shutting down %s' % c[ 0 ])
c[ 0 ]( *c[ 1 ] )
! _callbacks = []
# Shutdown the display
--- 125,136 ----
# Exit Freevo
#
!
# Shutdown all children still running
! for c in copy.copy(_callbacks):
log.debug( 'shutting down %s' % c[ 0 ])
c[ 0 ]( *c[ 1 ] )
! _callbacks = []
!
! util.popen.killall()
# Shutdown the display
***************
*** 137,140 ****
# Just wait until we're dead. SDL cannot be polled here anyway.
! while 1:
! time.sleep(1)
--- 144,146 ----
# Just wait until we're dead. SDL cannot be polled here anyway.
! notifier.loop()
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
