Author: dmeyer
Date: Sat Oct 28 19:26:02 2006
New Revision: 1934
Modified:
trunk/popcorn/src/backends/mplayer/player.py
trunk/popcorn/src/generic.py
Log:
support audio only for mplayer
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Sat Oct 28 19:26:02 2006
@@ -288,7 +288,7 @@
if self._state in (STATE_PLAYING, STATE_PAUSED):
self._state = STATE_IDLE
- elif line.startswith("Parsing input"):
+ elif line.startswith("Parsing input") and self._window:
# Delete the temporary key input file.
file = line[line.find("file")+5:]
os.unlink(file)
@@ -398,7 +398,10 @@
"-wid", hex(self._window.get_id()),
"-display", self._window.get_display().get_string(),
"-input", "conf=%s" % keyfile))
-
+ else:
+ # no window == no video out
+ args.extend(('-vo', 'null'))
+
# FIXME, add more settings here
args += [ '-ao', self._config.audio.driver ]
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Sat Oct 28 19:26:02 2006
@@ -74,10 +74,12 @@
Generic player. On object of this class will use the players from the
backend subdirectory for playback.
"""
- def __init__(self, window, config=default_config):
+ def __init__(self, window=None, config=default_config):
self._player = None
- self._size = window.get_size()
+ self._size = (0,0)
+ if window:
+ self._size = window.get_size()
self._window = window
self._config = config
-------------------------------------------------------------------------
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
