Update of /cvsroot/freevo/freevo/src/audio/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv15040/audio/plugins
Modified Files:
xine.py
Log Message:
make it possible to bypass version checking
Index: xine.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/xine.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** xine.py 10 Dec 2003 19:02:38 -0000 1.10
--- xine.py 10 Dec 2003 19:47:49 -0000 1.11
***************
*** 13,16 ****
--- 13,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.11 2003/12/10 19:47:49 dischi
+ # make it possible to bypass version checking
+ #
# Revision 1.10 2003/12/10 19:02:38 dischi
# move to new ChildApp2 and remove the internal thread
***************
*** 48,57 ****
! import popen2, re
import config # Configuration handler. reads config file.
import childapp # Handle child applications
import rc # The RemoteControl class.
!
from event import *
import plugin
--- 51,60 ----
! import re
import config # Configuration handler. reads config file.
import childapp # Handle child applications
import rc # The RemoteControl class.
! import util.popen3
from event import *
import plugin
***************
*** 72,96 ****
return
! xine_version = 0
! xine_cvs = 0
!
! child = popen2.Popen3('%s --version' % config.CONF.fbxine, 1, 100)
! while(1):
! data = child.fromchild.readline()
! if not data:
! break
! m = re.match('^.* v?([0-9])\.([0-9]+)\.([0-9]*).*', data)
! if m:
! if data.find('cvs') >= 0:
! xine_cvs = 1
! xine_version =int('%02d%02d%02d' % (int(m.group(1)), int(m.group(2)),
! int(m.group(3))))
! child.wait()
! if xine_cvs:
! xine_version += 1
!
! if xine_version < 923:
print _( 'ERROR' ) + ': ' + \
_( "'fbxine' version too old, plugin 'xine' deactivated" )
--- 75,93 ----
return
! if not hasattr(config, 'FBXINE_VERSION'):
! config.FBXINE_VERSION = 0
! for data in util.popen3.stdout('%s --version' % config.CONF.fbxine):
! m = re.match('^.* v?([0-9])\.([0-9]+)\.([0-9]*).*', data)
! if m:
! config.FBXINE_VERSION = int('%02d%02d%02d' % (int(m.group(1)),
! int(m.group(2)),
! int(m.group(3))))
! if data.find('cvs') >= 0:
! config.FBXINE_VERSION += 1
! _debug_('detect fbxine version %s' % config.FBXINE_VERSION)
!
! if config.FBXINE_VERSION < 923:
print _( 'ERROR' ) + ': ' + \
_( "'fbxine' version too old, plugin 'xine' deactivated" )
***************
*** 99,103 ****
# register xine as the object to play
! plugin.register(Xine(xine_version), plugin.AUDIO_PLAYER, True)
--- 96,100 ----
# register xine as the object to play
! plugin.register(Xine(), plugin.AUDIO_PLAYER, True)
***************
*** 109,115 ****
"""
! def __init__(self, version):
self.name = 'xine'
- self.xine_version = version
self.app_mode = 'audio'
self.app = None
--- 106,111 ----
"""
! def __init__(self):
self.name = 'xine'
self.app_mode = 'audio'
self.app = None
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
