Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv27546
Modified Files:
mplayer.py
Log Message:
add version detection patch
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/mplayer.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** mplayer.py 11 Jan 2004 23:21:58 -0000 1.57
--- mplayer.py 13 Jan 2004 15:03:45 -0000 1.58
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.58 2004/01/13 15:03:45 dischi
+ # add version detection patch
+ #
# Revision 1.57 2004/01/11 23:21:58 outlyer
# Fix for this crash:
***************
*** 98,116 ****
if not hasattr(config, 'MPLAYER_VERSION'):
child = popen2.Popen3( "%s -v" % config.MPLAYER_CMD, 1, 100)
! data = child.fromchild.readline() # Just need the first line
! if data:
! data = re.search( "^MPlayer (?P<version>\S+)", data )
! if data:
! _debug_("MPlayer version is: %s" % data.group( "version" ))
! data = data.group( "version" )
! if data[ 0 ] == "1":
! config.MPLAYER_VERSION = 1.0
! elif data[ 0 ] == "0":
! config.MPLAYER_VERSION = 0.9
! elif data[ 0 : 7 ] == "dev-CVS":
! config.MPLAYER_VERSION = 9999
! else:
! config.MPLAYER_VERSION = None
! _debug_("MPlayer version set to: %s" % config.MPLAYER_VERSION)
child.wait()
--- 101,124 ----
if not hasattr(config, 'MPLAYER_VERSION'):
child = popen2.Popen3( "%s -v" % config.MPLAYER_CMD, 1, 100)
! data = True
! while data:
! data = child.fromchild.readline()
! if data:
! data = re.search( "^MPlayer (?P<version>\S+)", data )
! if data:
! break
!
! if data:
! _debug_("MPlayer version is: %s" % data.group( "version" ))
! data = data.group( "version" )
! if data[ 0 ] == "1":
! config.MPLAYER_VERSION = 1.0
! elif data[ 0 ] == "0":
! config.MPLAYER_VERSION = 0.9
! elif data[ 0 : 7 ] == "dev-CVS":
! config.MPLAYER_VERSION = 9999
! else:
! config.MPLAYER_VERSION = None
! _debug_("MPlayer version set to: %s" % config.MPLAYER_VERSION)
child.wait()
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
