stage_director

@@ -51,6 +51,7 @@ class Synchronizer:

     self.posy_pause = None

     self.posy_pos = None

     self.posy_timestamp = None

+    self.restart = False

     self.sock = None

     self.verbose = False

     # startup

@@ -139,6 +140,21 @@ class Synchronizer:

       self.mplayer_pause = False

     self.mplayer_last_cmd_timestamp = datetime.datetime.now()

+  def mplayerSetFile(self, filename):

+    """set file played by MPlayer"""

+    # start MPlayer if not running or if restart mode is active

+    if self.mplayer is None or self.restart:

+      self.mplayerStart(filename)

+      return

+    # set new filename

+    self.dbg_print("MPlayer stdin: loadfile \"%s\"" % filename)

+    try:

+      self.mplayer.stdin.write("loadfile \"%s\"\n" % filename)

+    except:

+      pass

+    self.mplayer_name = filename

+    self.mplayer_last_cmd_timestamp = datetime.datetime.now()

+

   def mplayerSetPos(self, pos):

     """set MPlayer position"""

     # leave if no MPlayer running

@@ -180,8 +196,10 @@ class Synchronizer:

     # stop old MPlayer

     self.mplayerStop()

     # start MPlayer

-    cmd = [ "mplayer", "-volume", "80", "-slave", "-af", "scaletempo",

-            filename ]

+    cmd = [ "mplayer", "-volume", "80", "-slave", "-af", "scaletempo"]

+    if not self.restart:

+      cmd.append("-idle") # keep mplayer in idle mode if restart not desired

+    cmd.append(filename)

     print >>sys.stderr, "starting background process: " + " ".join(cmd)

     self.mplayer = subprocess.Popen(cmd, stdin = subprocess.PIPE,

                                          stdout = subprocess.PIPE,

@@ -286,7 +304,7 @@ class Synchronizer:

         self.playlist_idx += 1

         if self.playlist_idx >= len(self.playlist):

           self.playlist_idx = 0

-      self.mplayerStart(self.playlist[self.playlist_idx])

+      self.mplayerSetFile(self.playlist[self.playlist_idx])

   def playPosyName(self, posy_name):

     """play file by PoSy name (if found)"""

@@ -299,7 +317,7 @@ class Synchronizer:

     # file found -> (re-)start MPlayer

     else:

       self.playlist_idx = idx

-      self.mplayerStart(self.playlist[idx])

+      self.mplayerSetFile(self.playlist[idx])

   def posyCheckName(self, posy_name, file_name):

     """check if filename matches PoSyName"""

@@ -337,6 +355,10 @@ class Synchronizer:

     self.posy_pause = pause

     return True

+  def restartSet(self, restart):

+    """set restart mode"""

+    self.restart = restart

+

   def run(self):

     """run application"""

     try:

@@ -499,19 +521,25 @@ class Synchronizer:

 def main(argv):

   # check parameters

   if len(argv) < 2:

-    print >>sys.stderr, "usage: %s <playlist.txt> [-v]" % argv[0]

+    print >>sys.stderr, "usage: %s <playlist.txt> [<options>]" % argv[0]

+    print >>sys.stderr, "options: -v   verbose"

+    print >>sys.stderr, "         -r   restart MPlayer for each entry"

     return 2

   playlist = argv[1]

   verbose = False

-  if len(argv) >= 3:

-    if argv[2] == "-v":

+  restart = False

+  for arg in argv[2:]:

+    if arg == "-v":

       verbose = True

+    elif arg == "-r":

+      restart = True

     else:

-      print >>sys.stderr, "unknown option \"%s\"" % argv[2]

+      print >>sys.stderr, "unknown option \"%s\"" % arg

       return 3

   # run application

   app = Synchronizer()

   app.verboseSet(verbose)

+  app.restartSet(restart)

   if not app.playlistRead(playlist):

     print >>sys.stderr, "could not read playlist \"%s\"" % playlist

     return 4