Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv17855
Modified Files:
mplayer.py
Log Message:
Basic mplayer version detection. Convert -vop to -vf if cvs or 1.0pre1
is used
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/mplayer.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mplayer.py 1 Sep 2003 19:46:03 -0000 1.18
--- mplayer.py 2 Sep 2003 19:10:22 -0000 1.19
***************
*** 21,24 ****
--- 21,28 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.19 2003/09/02 19:10:22 dischi
+ # Basic mplayer version detection. Convert -vop to -vf if cvs or 1.0pre1
+ # is used
+ #
# Revision 1.18 2003/09/01 19:46:03 dischi
# add menuw to eventhandler, it may be needed
***************
*** 95,98 ****
--- 99,104 ----
mplayer = None
+ mplayer_version = 0
+
class PluginInterface(plugin.Plugin):
"""
***************
*** 102,107 ****
--- 108,127 ----
def __init__(self):
global mplayer
+ global mplayer_version
+
# create the mplayer object
plugin.Plugin.__init__(self)
+
+ child = popen2.Popen3('%s --version' % config.MPLAYER_CMD, 1, 100)
+ while(1):
+ data = child.fromchild.readline()
+ if not data:
+ break
+ if data.find('MPlayer 1') == 0:
+ mplayer_version = 1.0
+ if data.find('MPlayer 0') == 0:
+ mplayer_version = 0.9
+ child.wait()
+
mplayer = util.SynchronizedObject(MPlayer())
***************
*** 116,119 ****
--- 136,140 ----
the command and add it at the end as one vop argument
"""
+ global mplayer_version
ret = ''
vop = ''
***************
*** 124,128 ****
vop += ',%s' % arg
next_is_vop = FALSE
! elif arg == '-vop':
next_is_vop=TRUE
else:
--- 145,149 ----
vop += ',%s' % arg
next_is_vop = FALSE
! elif (arg == '-vop' or arg == '-vf'):
next_is_vop=TRUE
else:
***************
*** 130,133 ****
--- 151,156 ----
if vop:
+ if mplayer_version == 1:
+ return '%s -vf %s' % (ret,vop[1:])
return '%s -vop %s' % (ret,vop[1:])
return ret
-------------------------------------------------------
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
