- File:
-
- 1 edited
-
server/lib/gutenbach/server/player.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
server/lib/gutenbach/server/player.py
rcf0d7e8 ra9eb577e 3 3 import subprocess 4 4 import time 5 from . import sync6 5 7 6 # initialize logger … … 25 24 26 25 @property 27 @sync28 26 def is_playing(self): 29 if self._dryrun: 30 return self.isAlive() and not self.is_done 31 else: 32 return self.isAlive() and \ 33 not self.is_done and \ 34 self.player is not None and \ 35 self.player.poll() is None 27 with self.lock: 28 if self._dryrun: 29 playing = self.isAlive() and not self.is_done 30 else: 31 playing = self.isAlive() and \ 32 not self.is_done and \ 33 self.player is not None and \ 34 self.player.poll() is None 35 return playing 36 36 37 37 @property 38 @sync39 38 def is_paused(self): 40 return self.is_playing and self._paused 39 with self.lock: 40 paused = self.is_playing and self._paused 41 return paused 41 42 42 43 @property … … 48 49 return self._callback 49 50 @callback.setter 50 @sync51 51 def callback(self, val): 52 self._callback = val 52 with self.lock: 53 self._callback = val 53 54 54 55 def start(self): … … 111 112 112 113 def mplayer_pause(self): 113 # Note: Inner lock due to sleep.114 114 with self.lock: 115 115 if self.is_playing: … … 123 123 124 124 def mplayer_stop(self): 125 # Note: Inner Lock due to join.126 125 with self.lock: 127 126 if self.is_playing:
Note: See TracChangeset
for help on using the changeset viewer.
