Author: duncan
Date: Fri Nov 3 07:28:45 2006
New Revision: 8532
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
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 changes from rel-1-6
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Fri Nov 3 07:28:45 2006
@@ -18,6 +18,7 @@
* New encoding server, allows re-encoding TV programs and ripping DVDs
(F#1580642,F#1578402)
* New RSS server (F#1580407)
* New XM online plugin (F#1580412)
+ * Replaced mmpython with kaa.base and kaa.metadata (F#1580712)
* Updated DEBUGGING, IP, PORT, UID and GUI based on helper name (F#1580628)
* Updated helper convert_config (F#1578183)
@@ -25,9 +26,11 @@
Release 1.6.1 (2006-??-??):
---------------------------
+ * Updated translations for new plug-ins and skins (F#1587980)
* Fixed detached music player when the plug-in mplayervis is enabled
(B#1582048)
* Fixed IMDB parser, the title should not work (B#1586579)
* Fixed VIDEO_INTERLACING = False having no effect (B#1586721)
+ * Fixed xine --no-lirc option when compiled without lirc support (B#1589722)
Release 1.6.0 (2006-10-31):
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Fri Nov 3 07:28:45 2006
@@ -228,6 +228,7 @@
(5.16,
'''Removed the recordable setting in VIDEO_GROUPS, please remove this
setting.
Added xmltv-1.2 this requires elementtree
+ Added XINE_HAS_NO_LIRC to see if '--no-lirc' should be passed to xine
Added XINE_TV_VO_DEV, XINE_TV_AO_DEV, and XINE_TV_TIMESHIFT_FILEMASK for
the
new tv.ivtv_xine_tv plugin (the latter should be e.g. "/tmp/xine-buf-"
and point
to a place with enough free diskspace (several gigabytes).
@@ -1370,10 +1371,6 @@
MPLAYER_VF_INTERLACED = 'pp=de/fd'
MPLAYER_VF_PROGRESSIVE = 'pp=de'
-# default to XINE_VO/AO_DEV:
-XINE_TV_VO_DEV = None
-XINE_TV_AO_DEV = None
-XINE_TV_TIMESHIFT_FILEMASK = "you must set XINE_TV_TIMESHIFT_FILEMASK in your
local_conf.py (e.g.=/tmp/xine-buf-)"
# ======================================================================
# Xine settings:
@@ -1410,7 +1407,10 @@
if CONF.fbxine:
plugin.activate('audio.xine')
-# default to XINE_VO/AO_DEV:
+# Set to False if xine doesn't have '--no-lirc' option
+XINE_HAS_NO_LIRC = True
+
+# Defaults to XINE_VO/AO_DEV:
XINE_TV_VO_DEV = None
XINE_TV_AO_DEV = None
XINE_TV_TIMESHIFT_FILEMASK = "you must set XINE_TV_TIMESHIFT_FILEMASK in your
local_conf.py"
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Fri Nov 3 07:28:45 2006
@@ -898,6 +898,9 @@
# XINE_AO_DEV = 'oss' # alsa or oss
+# Set to False if xine doesn't have '--no-lirc' option
+# XINE_HAS_NO_LIRC = True
+
# ======================================================================
# IVTV Xine TV settings:
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 Fri Nov 3 07:28:45 2006
@@ -91,7 +91,7 @@
self.app_mode = 'audio'
self.app = None
self.command = '%s -V none -A %s --stdctl' % (config.CONF.fbxine,
config.XINE_AO_DEV)
- if rc.PYLIRC:
+ if config.XINE_HAS_NO_LIRC:
self.command = '%s --no-lirc' % self.command
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 Fri Nov 3 07:28:45 2006
@@ -124,7 +124,7 @@
command = copy.copy(self.command)
- if not rc.PYLIRC and '--no-lirc' in command:
+ if not config.XINE_HAS_NO_LIRC and '--no-lirc' in command:
command.remove('--no-lirc')
command.append('dvb://' + tuner_channel)
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 Fri Nov 3 07:28:45 2006
@@ -134,7 +134,7 @@
if item['deinterlace']:
command.append('-D')
- if not rc.PYLIRC and '--no-lirc' in command:
+ if not config.XINE_HAS_NO_LIRC and '--no-lirc' in command:
command.remove('--no-lirc')
self.max_audio = 0
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
