Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv12072/src/tv/plugins
Modified Files:
timeshift.py tvtime.py mplayer.py
Log Message:
Made a check to see if file exists before unlinking.
Index: timeshift.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/timeshift.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** timeshift.py 1 Jul 2003 20:35:58 -0000 1.5
--- timeshift.py 1 Jul 2003 21:47:34 -0000 1.6
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/07/01 21:47:34 outlyer
+ # Made a check to see if file exists before unlinking.
+ #
# Revision 1.5 2003/07/01 20:35:58 outlyer
# Replaced the os.system('rm ...') calls with os.unlink()
***************
*** 186,190 ****
config.MPLAYER_USE_WID):
if DEBUG: print 'Got freevo_xwin and x11'
! os.unlink('/tmp/freevo.wid')
os.system('./runapp ./freevo_xwin 0 0 %s %s > /tmp/freevo.wid &' %
(osd.width, osd.height))
--- 189,193 ----
config.MPLAYER_USE_WID):
if DEBUG: print 'Got freevo_xwin and x11'
! if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
os.system('./runapp ./freevo_xwin 0 0 %s %s > /tmp/freevo.wid &' %
(osd.width, osd.height))
***************
*** 277,281 ****
time.sleep(0.05)
print 'stopped %s app' % self.mode
! os.unlink('/tmp/freevo.wid')
--- 280,284 ----
time.sleep(0.05)
print 'stopped %s app' % self.mode
! if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
***************
*** 381,385 ****
if DEBUG: print 'Killing mplayer'
util.killall('freevo_xwin')
! os.unlink('/tmp/freevo.wid')
if config.MPLAYER_DEBUG:
self.log_stdout.close()
--- 384,388 ----
if DEBUG: print 'Killing mplayer'
util.killall('freevo_xwin')
! if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
if config.MPLAYER_DEBUG:
self.log_stdout.close()
***************
*** 450,454 ****
self.tsinput.close()
# Remove the buffer file
! os.unlink('%s' % config.TIMESHIFT_BUFFER)
# Ok, we can use the OSD again.
--- 453,457 ----
self.tsinput.close()
# Remove the buffer file
! if os.path.exists('%s' % config.TIMESHIFT_BUFFER): os.unlink('%s' %
config.TIMESHIFT_BUFFER)
# Ok, we can use the OSD again.
Index: tvtime.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/tvtime.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tvtime.py 1 Jul 2003 20:38:51 -0000 1.11
--- tvtime.py 1 Jul 2003 21:47:34 -0000 1.12
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2003/07/01 21:47:34 outlyer
+ # Made a check to see if file exists before unlinking.
+ #
# Revision 1.11 2003/07/01 20:38:51 outlyer
# system->unlink
***************
*** 367,371 ****
if DEBUG: print 'Killing tvtime'
util.killall('freevo_xwin')
! os.unlink('/tmp/freevo.wid')
if config.MPLAYER_DEBUG:
self.log_stdout.close()
--- 370,374 ----
if DEBUG: print 'Killing tvtime'
util.killall('freevo_xwin')
! if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
if config.MPLAYER_DEBUG:
self.log_stdout.close()
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mplayer.py 1 Jul 2003 20:35:58 -0000 1.9
--- mplayer.py 1 Jul 2003 21:47:35 -0000 1.10
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.10 2003/07/01 21:47:35 outlyer
+ # Made a check to see if file exists before unlinking.
+ #
# Revision 1.9 2003/07/01 20:35:58 outlyer
# Replaced the os.system('rm ...') calls with os.unlink()
***************
*** 233,237 ****
config.MPLAYER_USE_WID):
if DEBUG: print 'Got freevo_xwin and x11'
! os.unlink('/tmp/freevo.wid')
os.system('./runapp ./freevo_xwin 0 0 %s %s > /tmp/freevo.wid &' %
(osd.width, osd.height))
--- 236,240 ----
config.MPLAYER_USE_WID):
if DEBUG: print 'Got freevo_xwin and x11'
! if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
os.system('./runapp ./freevo_xwin 0 0 %s %s > /tmp/freevo.wid &' %
(osd.width, osd.height))
***************
*** 324,328 ****
time.sleep(0.05)
print 'stopped %s app' % self.mode
! os.unlink('/tmp/freevo.wid')
--- 327,331 ----
time.sleep(0.05)
print 'stopped %s app' % self.mode
! if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
***************
*** 408,412 ****
if DEBUG: print 'Killing mplayer'
util.killall('freevo_xwin')
! os.unlink('/tmp/freevo.wid')
if config.MPLAYER_DEBUG:
self.log_stdout.close()
--- 411,415 ----
if DEBUG: print 'Killing mplayer'
util.killall('freevo_xwin')
! if os.path.exists ('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
if config.MPLAYER_DEBUG:
self.log_stdout.close()
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
