Author: duncan
Date: Mon Nov 27 08:06:15 2006
New Revision: 8663
Modified:
branches/rel-1/freevo/src/audio/plugins/xine.py
branches/rel-1/freevo/src/tv/plugins/xine.py
branches/rel-1/freevo/src/video/plugins/xine.py
Log:
Merged xine changes from rel-1-6
Modified: branches/rel-1/freevo/src/audio/plugins/xine.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/xine.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/xine.py Mon Nov 27 08:06:15 2006
@@ -52,29 +52,9 @@
config.CONF.fbxine
except:
print String(_( 'ERROR' )) + ': ' + \
- String(_( "'fbxine' not found, plugin 'xine' deactivated" ))
+ String(_( "'fbxine' not found, 'xine' audio plugin
deactivated" ))
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 String(_( 'ERROR' )) + ': ' + \
- String(_( "'fbxine' version too old, plugin 'xine'
deactivated" ))
- print String(_( 'You need software %s' )) % 'xine-ui > 0.9.22'
- return
-
# register xine as the object to play
plugin.register(Xine(), plugin.AUDIO_PLAYER, True)
Modified: branches/rel-1/freevo/src/tv/plugins/xine.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/xine.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/xine.py Mon Nov 27 08:06:15 2006
@@ -78,7 +78,7 @@
config.XINE_COMMAND
except:
print String(_( 'ERROR' )) + ': ' + \
- String(_("'XINE_COMMAND' not defined, plugin 'xine'
deactivated.\n" \
+ String(_("'XINE_COMMAND' not defined, 'xine' tv plugin
deactivated.\n" \
'please check the xine section in freevo_config.py'
))
return
Modified: branches/rel-1/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/xine.py (original)
+++ branches/rel-1/freevo/src/video/plugins/xine.py Mon Nov 27 08:06:15 2006
@@ -60,7 +60,7 @@
config.XINE_COMMAND
except:
print String(_( 'ERROR' )) + ': ' + \
- String(_("'XINE_COMMAND' not defined, plugin 'xine'
deactivated.\n" \
+ String(_("'XINE_COMMAND' not defined, 'xine' video plugin
deactivated.\n" \
'please check the xine section in freevo_config.py'
))
return
@@ -68,7 +68,6 @@
type = 'fb'
elif config.XINE_COMMAND.find('df_xine') >= 0:
type = 'df'
- config.XINE_VERSION = 923
else:
type = 'X'
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
