Changeset 345c476 for server/lib/gutenbach/server/player.py

Timestamp:

Jan 11, 2012, 8:36:27 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

a2b0582

Parents:

09790fe

git-author:

Jessica B. Hamrick <jhamrick@…> (01/11/12 20:36:27)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/11/12 20:36:27)

Message:

Make status handling better in job.py

File:

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

server/lib/gutenbach/server/player.py

@@ -17 +17 @@
             self.player = None
             self._callback = None
+            self._paused = False
 
     @property
@@ -23 +24 @@
             playing = self.player and self.player.poll() is None
         return playing
+
+    @property
+    def is_paused(self):
+        with self.lock:
+            paused = self.is_playing and self._paused
+        return paused
+
+    @property
+    def is_done(self):
+        with self.lock:
+            done = self.player and self.player.poll() is not None
+        return done
 
     @property
@@ -41 +54 @@
                 self.callback()
 
-        self.fh.close()
-        self.fh = None
-
     def mplayer_play(self):
+        if not self.isAlive():
+            return
+        
         logger.info("playing file '%s'" % self.fh.name)
+        self._paused = False
         
         # open mplayer
@@ -63 +77 @@
                 break
             time.sleep(0.1)
-            
+
         logger.info("mplayer finished with code %d" % self.player.returncode)
 
@@ -77 +91 @@
 
     def mplayer_pause(self):
+        if not self.isAlive():
+            return
+        
         with self.lock:
             if self.is_playing:
                 self.player.stdin.write("pause\n")
+                self._paused = not(self._paused)
                 
     def mplayer_stop(self):
+        if not self.isAlive():
+            return
+        
         with self.lock:
             if self.is_playing: