Changes in server/lib/gutenbach/server/player.py [bd5bffc:cf0d7e8]

File:

• server/lib/gutenbach/server/player.py (modified) (3 diffs)

server/lib/gutenbach/server/player.py

@@ -28 +28 @@
     def is_playing(self):
         if self._dryrun:
-            return self.ident is not None and \
-                   self.isAlive() and \
-                   not self.is_done
+            return self.isAlive() and not self.is_done
         else:
-            return self.ident is not None and \
-                   self.isAlive() and \
-                   not self.is_done and \
-                   self.player is not None and \
-                   self.player.poll() is None
-        
+            return self.isAlive() and \
+                      not self.is_done and \
+                      self.player is not None and \
+                      self.player.poll() is None
+
     @property
     @sync
@@ -124 +121 @@
                 logger.warning("trying to pause non-playing job")
         time.sleep(self._lag)
-
+                
     def mplayer_stop(self):
-        # Note: Inner lock due to join.
+        # Note: Inner Lock due to join.
         with self.lock:
             if self.is_playing:
@@ -137 +134 @@
                 logger.warning("trying to stop non-playing job")
         self.join()
-