Author: dmeyer
Date: Thu Nov 2 17:36:10 2006
New Revision: 1964
Modified:
trunk/popcorn/src/generic.py
Log:
do not stop idle player
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Thu Nov 2 17:36:10 2006
@@ -43,7 +43,7 @@
from backends.manager import get_player_class, get_all_players
# get logging object
-log = logging.getLogger('player')
+log = logging.getLogger('popcorn')
def required_states(*states):
"""
@@ -183,7 +183,6 @@
"""
The real open function called from 'open'.
"""
- log.info('open')
self._player.set_config(self._config)
self._player.open(mrl)
self._player.set_window(self._window)
@@ -211,7 +210,8 @@
if not self._player:
self._create_player(cls)
else:
- self._player.stop()
+ if not self._player.get_state() in STATE_IDLE:
+ self._player.stop()
if not isinstance(self._player, cls):
self._player.release()
self._create_player(cls)
@@ -236,7 +236,8 @@
"""
# FIXME: handle player that are in a deadlock and do not
# want to be killed.
- self._player.stop()
+ if not self._player.get_state() in STATE_IDLE:
+ self._player.stop()
@required_states(STATE_PLAYING, STATE_PAUSED)
-------------------------------------------------------------------------
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
