Author: tack
Date: Thu Jun 21 15:53:45 2007
New Revision: 2714
Modified:
trunk/popcorn/src/backends/gstreamer/config.cxml
trunk/popcorn/src/backends/manager.py
trunk/popcorn/src/backends/mplayer/config.cxml
trunk/popcorn/src/backends/xine/config.cxml
trunk/popcorn/src/generic.py
trunk/popcorn/src/utils/ipc.py
Log:
Renable 'activate' to 'enabled' in backend config. Less awkward term.
Modified: trunk/popcorn/src/backends/gstreamer/config.cxml
==============================================================================
--- trunk/popcorn/src/backends/gstreamer/config.cxml (original)
+++ trunk/popcorn/src/backends/gstreamer/config.cxml Thu Jun 21 15:53:45 2007
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<config>
<desc lang="en">gstreamer configuration</desc>
- <var name="activate" default="False">
- <desc lang="en">activate backend</desc>
+ <var name="enabled" default="False">
+ <desc lang="en">Set True to enable the GStreamer backend</desc>
</var>
<group name="capability">
Modified: trunk/popcorn/src/backends/manager.py
==============================================================================
--- trunk/popcorn/src/backends/manager.py (original)
+++ trunk/popcorn/src/backends/manager.py Thu Jun 21 15:53:45 2007
@@ -52,7 +52,7 @@
return
for backend in config:
- if getattr(getattr(config, backend), 'activate', False):
+ if getattr(getattr(config, backend), 'enabled', False):
try:
# import the backend and register it.
exec('from %s import import_backend' % backend)
Modified: trunk/popcorn/src/backends/mplayer/config.cxml
==============================================================================
--- trunk/popcorn/src/backends/mplayer/config.cxml (original)
+++ trunk/popcorn/src/backends/mplayer/config.cxml Thu Jun 21 15:53:45 2007
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<config>
- <desc lang="en">mplayer configuration</desc>
- <var name="activate" default="True">
- <desc lang="en">activate backend</desc>
+ <desc lang="en">MPlayer configuration</desc>
+ <var name="enabled" default="True">
+ <desc lang="en">Set True to enable the MPlayer backend</desc>
</var>
<var name="path" type="str">
<desc lang="en">Path to mplayer binary (if empty, search $PATH)</desc>
Modified: trunk/popcorn/src/backends/xine/config.cxml
==============================================================================
--- trunk/popcorn/src/backends/xine/config.cxml (original)
+++ trunk/popcorn/src/backends/xine/config.cxml Thu Jun 21 15:53:45 2007
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<config>
<desc lang="en">xine configuration</desc>
- <var name="activate" default="True">
- <desc lang="en">activate backend</desc>
+ <var name="enabled" default="True">
+ <desc lang="en">Set True to enable the Xine backend</desc>
</var>
<group name="deinterlacer">
<desc>Deinterlacer options</desc>
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Thu Jun 21 15:53:45 2007
@@ -165,12 +165,12 @@
"""
Return player class object to play the current mrl. This function
uses self._media, self._open_caps as mrl and caps and respects
- the failed player and the player deactived in the config. If player
+ the failed player and the player disabled in the config. If player
is given as argument, this player will be used.
"""
exclude = self._failed_player[:]
for p in backends.manager.get_all_players():
- if not getattr(config, p).activate and not p in exclude:
+ if not getattr(config, p).enabled and not p in exclude:
exclude.append(p)
return backends.manager.get_player_class(\
self._media, self._open_caps, exclude, player, self._window)
@@ -310,6 +310,7 @@
if mrl.find('://') == -1:
mrl = 'file://%s'
self._media = kaa.metadata.Media(hash=dict(url=mrl,
media='MEDIA_UNKNOWN'))
+ print "MEDIA", self._media.url
self._media.scheme = self._media.url[:self._media.url.find(':/')]
self._open_caps = caps
Modified: trunk/popcorn/src/utils/ipc.py
==============================================================================
--- trunk/popcorn/src/utils/ipc.py (original)
+++ trunk/popcorn/src/utils/ipc.py Thu Jun 21 15:53:45 2007
@@ -115,6 +115,11 @@
setattr(self._parent, command[4:], args[0])
return True
raise AttributeError('parent has no attribute %s', command)
+ elif '@@@' in line:
+ # More debugging stuff; use log.info here because debug loglevel
+ # is too verbose for most cases (and logger doesn't support
+ # debug levels)
+ log.info('[%d] %s' % (self._child.child.pid, line))
if self.gdb and line.startswith("Program received signal SIGSEGV"):
self._child.write("thread apply all bt\n")
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
