Author: dmeyer
Date: Thu Nov  2 19:16:03 2006
New Revision: 1971

Modified:
   trunk/popcorn/src/generic.py

Log:
add STATE_NOT_RUNNING for mplayer

Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py        (original)
+++ trunk/popcorn/src/generic.py        Thu Nov  2 19:16:03 2006
@@ -120,6 +120,8 @@
         will emit the same signal to the application, handles some internal
         changes and will call the pending calls based on the new state.
         """
+        log.debug('player signal: %s', signal)
+        
         if signal == 'failed':
             # The playing has failed. This means that the player we wanted to
             # use was unable to play this file. In that case we add the player
@@ -178,7 +180,7 @@
             self._player.signals[sig].connect_weak(self._state_change, sig)
 
     
-    @required_states(STATE_IDLE)
+    @required_states(STATE_NOT_RUNNING, STATE_IDLE)
     def _open(self, mrl):
         """
         The real open function called from 'open'.
@@ -210,7 +212,7 @@
         if not self._player:
             self._create_player(cls)
         else:
-            if not self._player.get_state() in (STATE_IDLE,):
+            if not self._player.get_state() in (STATE_IDLE, STATE_NOT_RUNNING):
                 self._player.stop()
             if not isinstance(self._player, cls):
                 self._player.release()

-------------------------------------------------------------------------
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

Reply via email to