Changeset 7f1098c for server/lib/gutenbach/server/player.py
- Timestamp:
- Jan 21, 2012, 6:24:36 PM (12 years ago)
- Branches:
- no-cups
- Children:
- 6c60b2e
- Parents:
- 279640c (diff), bd5bffc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Daniel Cooper <danny@…> (01/21/12 18:24:36)
- git-committer:
- Daniel Cooper <danny@…> (01/21/12 18:24:36)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
server/lib/gutenbach/server/player.py
rcf0d7e8 rbd5bffc 28 28 def is_playing(self): 29 29 if self._dryrun: 30 return self.isAlive() and not self.is_done 30 return self.ident is not None and \ 31 self.isAlive() and \ 32 not self.is_done 31 33 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 36 34 return self.ident is not None and \ 35 self.isAlive() and \ 36 not self.is_done and \ 37 self.player is not None and \ 38 self.player.poll() is None 39 37 40 @property 38 41 @sync … … 121 124 logger.warning("trying to pause non-playing job") 122 125 time.sleep(self._lag) 123 126 124 127 def mplayer_stop(self): 125 # Note: Inner Lock due to join.128 # Note: Inner lock due to join. 126 129 with self.lock: 127 130 if self.is_playing: … … 134 137 logger.warning("trying to stop non-playing job") 135 138 self.join() 139
Note: See TracChangeset
for help on using the changeset viewer.