Author: duncan
Date: Tue Oct 10 06:14:53 2006
New Revision: 8341
Modified:
branches/rel-1-5/freevo/src/audio/plugins/xine.py
branches/rel-1-5/freevo/src/tv/plugins/ivtv_xine_tv.py
branches/rel-1-5/freevo/src/tv/plugins/xine.py
Log:
[ 1574273 ] Remove the XINE version stuff
Fix applied and removed old cvs logs.
Modified: branches/rel-1-5/freevo/src/audio/plugins/xine.py
==============================================================================
--- branches/rel-1-5/freevo/src/audio/plugins/xine.py (original)
+++ branches/rel-1-5/freevo/src/audio/plugins/xine.py Tue Oct 10 06:14:53 2006
@@ -9,13 +9,6 @@
#
# Todo:
#
-#
-# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.16 2004/07/10 12:33:38 dischi
-# header cleanup
-#
-#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
Modified: branches/rel-1-5/freevo/src/tv/plugins/ivtv_xine_tv.py
==============================================================================
--- branches/rel-1-5/freevo/src/tv/plugins/ivtv_xine_tv.py (original)
+++ branches/rel-1-5/freevo/src/tv/plugins/ivtv_xine_tv.py Tue Oct 10
06:14:53 2006
@@ -1,3 +1,34 @@
+# -*- coding: iso-8859-1 -*-
+# -----------------------------------------------------------------------
+# ivtv_xine_tv.py - live tv pause feature
+# -----------------------------------------------------------------------
+# $Id: xine.py 5860 2004-07-10 12:33:43Z dischi $
+#
+# Notes: Use xine (or better fbxine) to play tv
+#
+# Todo:
+#
+# -----------------------------------------------------------------------
+# Freevo - A Home Theater PC framework
+# Copyright (C) 2002 Krister Lagerstrom, et al.
+# Please see the file freevo/Docs/CREDITS for a complete list of authors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# ----------------------------------------------------------------------- */
+
import config
import time, os
Modified: branches/rel-1-5/freevo/src/tv/plugins/xine.py
==============================================================================
--- branches/rel-1-5/freevo/src/tv/plugins/xine.py (original)
+++ branches/rel-1-5/freevo/src/tv/plugins/xine.py Tue Oct 10 06:14:53 2006
@@ -12,14 +12,6 @@
#
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.2 2004/07/10 12:33:42 dischi
-# header cleanup
-#
-# Revision 1.1 2004/06/20 12:01:19 dischi
-# basic xine dvb plugin
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -95,27 +87,8 @@
else:
type = 'X'
- if not hasattr(config, 'XINE_VERSION'):
- config.XINE_VERSION = 0
- for data in util.popen3.stdout('%s --version' %
config.XINE_COMMAND):
- m = re.match('^.* v?([0-9])\.([0-9]+)\.([0-9]*).*', data)
- if m:
- config.XINE_VERSION = int('%02d%02d%02d' %
(int(m.group(1)),
-
int(m.group(2)),
-
int(m.group(3))))
- if data.find('cvs') >= 0:
- config.XINE_VERSION += 1
-
- _debug_('detect xine version %s' % config.XINE_VERSION)
-
- if config.XINE_VERSION < 922:
- print String(_( 'ERROR' )) + ': ' + \
- String(_( "'xine-ui' version too old, plugin 'xine'
deactivated" ))
- print String(_( 'You need software %s' )) % 'xine-ui > 0.9.21'
- return
-
# register xine as the object to play
- plugin.register(Xine(type, config.XINE_VERSION), plugin.TV, False)
+ plugin.register(Xine(type), plugin.TV, False)
@@ -123,12 +96,11 @@
"""
the main class to control xine
"""
- def __init__(self, type, version):
+ def __init__(self, type):
self.name = 'xine'
self.app_mode = 'tv'
self.xine_type = type
- self.version = version
self.app = None
self.fc = FreevoChannels()
-------------------------------------------------------------------------
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
