Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv3586/tv/plugins
Modified Files:
ivtv_basic_tv.py mplayer.py timeshift.py tvtime.py
Log Message:
removed freevo_xwin support. Most users have problems with it and it works without it
Index: ivtv_basic_tv.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/ivtv_basic_tv.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ivtv_basic_tv.py 18 Jul 2003 12:09:03 -0000 1.5
--- ivtv_basic_tv.py 6 Aug 2003 19:32:39 -0000 1.6
***************
*** 13,16 ****
--- 13,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/08/06 19:32:39 dischi
+ # removed freevo_xwin support. Most users have problems with it and it works without
it
+ #
# Revision 1.5 2003/07/18 12:09:03 outlyer
# Oops... shouldn't have committed that
***************
*** 180,220 ****
return
- # Support for X11, getting the keyboard events
- if (os.path.isfile('./freevo_xwin') and osd.sdl_driver == 'x11' and
- 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))
-
- # Wait until freevo_xwin signals us, but have a timeout so we
- # don't hang here if something goes wrong!
- delay_ms = 50
- timeout_ms = 5000
- while 1:
- if os.path.isfile('/tmp/freevo.wid'):
- # Check if the whole line has been written yet
- f = open('/tmp/freevo.wid')
- val = f.read()
- f.close()
- if len(val) > 5 and val[-1] == '\n':
- break
- time.sleep(delay_ms / 1000.0)
- timeout_ms -= delay_ms
- if timeout_ms < 0.0:
- print 'Could not start freevo_xwin!' # XXX ui.message()
- return
-
- if DEBUG: print 'Got freevo.wid'
- try:
- f = open('/tmp/freevo.wid')
- wid = int(f.read().strip(), 16)
- f.close()
- mpl += ' -wid 0x%08x -xy %s -monitoraspect 4:3' % (wid, osd.width)
- if DEBUG: print 'Got WID = 0x%08x' % wid
- except:
- print 'Cannot access freevo_xwin data!' # XXX ui.message()
- pass
-
command = mpl
self.mode = mode
--- 183,186 ----
***************
*** 355,360 ****
# XXX Krister testcode for proper X11 video
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()
--- 321,324 ----
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mplayer.py 5 Aug 2003 18:37:02 -0000 1.13
--- mplayer.py 6 Aug 2003 19:32:40 -0000 1.14
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.14 2003/08/06 19:32:40 dischi
+ # removed freevo_xwin support. Most users have problems with it and it works without
it
+ #
# Revision 1.13 2003/08/05 18:37:02 dischi
# fix mplayer plugin to work with dfbmga, too
***************
*** 243,283 ****
return
- # Support for X11, getting the keyboard events
- if (os.path.isfile('./freevo_xwin') and osd.sdl_driver == 'x11' and
- 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))
-
- # Wait until freevo_xwin signals us, but have a timeout so we
- # don't hang here if something goes wrong!
- delay_ms = 50
- timeout_ms = 5000
- while 1:
- if os.path.isfile('/tmp/freevo.wid'):
- # Check if the whole line has been written yet
- f = open('/tmp/freevo.wid')
- val = f.read()
- f.close()
- if len(val) > 5 and val[-1] == '\n':
- break
- time.sleep(delay_ms / 1000.0)
- timeout_ms -= delay_ms
- if timeout_ms < 0.0:
- print 'Could not start freevo_xwin!' # XXX ui.message()
- return
-
- if DEBUG: print 'Got freevo.wid'
- try:
- f = open('/tmp/freevo.wid')
- wid = int(f.read().strip(), 16)
- f.close()
- mpl += ' -wid 0x%08x -xy %s -monitoraspect 4:3' % (wid, osd.width)
- if DEBUG: print 'Got WID = 0x%08x' % wid
- except:
- print 'Cannot access freevo_xwin data!' # XXX ui.message()
- pass
-
command = mpl
self.mode = mode
--- 246,249 ----
***************
*** 425,430 ****
# XXX Krister testcode for proper X11 video
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()
--- 391,394 ----
Index: timeshift.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/timeshift.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** timeshift.py 13 Jul 2003 19:35:45 -0000 1.7
--- timeshift.py 6 Aug 2003 19:32:40 -0000 1.8
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2003/08/06 19:32:40 dischi
+ # removed freevo_xwin support. Most users have problems with it and it works without
it
+ #
# Revision 1.7 2003/07/13 19:35:45 rshortt
# Change osd.focused_app to a function that returns the last object in
***************
*** 190,226 ****
return
- # Support for X11, getting the keyboard events
- if (os.path.isfile('./freevo_xwin') and osd.sdl_driver == 'x11' and
- 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))
-
- # Wait until freevo_xwin signals us, but have a timeout so we
- # don't hang here if something goes wrong!
- delay_ms = 50
- timeout_ms = 5000
- while 1:
- if os.path.isfile('/tmp/freevo.wid'):
- # Check if the whole line has been written yet
- val = open('/tmp/freevo.wid').read()
- if len(val) > 5 and val[-1] == '\n':
- break
- time.sleep(delay_ms / 1000.0)
- timeout_ms -= delay_ms
- if timeout_ms < 0.0:
- print 'Could not start freevo_xwin!' # XXX ui.message()
- return
-
- if DEBUG: print 'Got freevo.wid'
- try:
- wid = int(open('/tmp/freevo.wid').read().strip(), 16)
- mpl += ' -wid 0x%08x -xy %s -monitoraspect 4:3' % (wid, osd.width)
- if DEBUG: print 'Got WID = 0x%08x' % wid
- except:
- print 'Cannot access freevo_xwin data!' # XXX ui.message()
- pass
-
command = mpl
self.mode = mode
--- 193,196 ----
***************
*** 388,393 ****
# XXX Krister testcode for proper X11 video
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()
--- 358,361 ----
Index: tvtime.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/tvtime.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tvtime.py 13 Jul 2003 19:35:45 -0000 1.13
--- tvtime.py 6 Aug 2003 19:32:40 -0000 1.14
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.14 2003/08/06 19:32:40 dischi
+ # removed freevo_xwin support. Most users have problems with it and it works without
it
+ #
# Revision 1.13 2003/07/13 19:35:45 rshortt
# Change osd.focused_app to a function that returns the last object in
***************
*** 374,379 ****
# XXX Krister testcode for proper X11 video
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()
--- 377,380 ----
-------------------------------------------------------
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/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
