[Debconf-video-commits] r726 - package/trunk/src/preroles

[Ben Hutchings]

Author: benh
Date: 2011-11-06 14:26:44 +0000 (Sun, 06 Nov 2011)
New Revision: 726

Modified:
   package/trunk/src/preroles/genPrerole.py
   package/trunk/src/preroles/xml2prerole.py
Log:
Use ffmpeg -y option to overwrite output file; remove useless -o option


Modified: package/trunk/src/preroles/genPrerole.py
===================================================================
--- package/trunk/src/preroles/genPrerole.py	2011-11-06 14:23:32 UTC (rev 725)
+++ package/trunk/src/preroles/genPrerole.py	2011-11-06 14:26:44 UTC (rev 726)
@@ -218,14 +218,10 @@
     if not os.path.exists('silence'):
         os.system('dd if=/dev/zero of=silence ibs=10240 count=10240')
 
-    #check if prerole file is present if yes delete it
-    if os.path.exists(args.output+args.id+"prerole.dv"):
-        commands.getstatusoutput("rm -f "+args.output+args.id+"prerole.dv")
-
     #cat the first part of the prerole in front of the edittedt one
     result = commands.getstatusoutput('cat preprerole.dv '+ args.workdir+args.id +'.tmp > '+ args.workdir+args.id +'.tmp1')
 
-    result = commands.getstatusoutput("ffmpeg -f dv -i "+args.workdir+args.id+".tmp1 -f s16le -ar 48000 -ac 2 -i silence -target pal-dv -vcodec copy -t "+prerole_duration+" "+args.workdir+args.id+"_prerole.dv")
+    result = commands.getstatusoutput("ffmpeg -f dv -i "+args.workdir+args.id+".tmp1 -f s16le -ar 48000 -ac 2 -i silence -target pal-dv -vcodec copy -t "+prerole_duration+" -y "+args.workdir+args.id+"_prerole.dv")
     if result[0] == 0:
         commands.getstatusoutput("rm -f "+args.workdir+args.id+".tmp "+args.workdir+args.id+".tmp1")
     else:

Modified: package/trunk/src/preroles/xml2prerole.py
===================================================================
--- package/trunk/src/preroles/xml2prerole.py	2011-11-06 14:23:32 UTC (rev 725)
+++ package/trunk/src/preroles/xml2prerole.py	2011-11-06 14:26:44 UTC (rev 726)
@@ -11,10 +11,6 @@
 root = lxml.etree.fromstring(daten).getroottree()
 
 SCRIPT_FULLPATH = "genPrerole.py"
-EXTRA_ARGS = [
-        "-o", "../prerole/",
-        #"-w", "/tmp/workdir"
-        ]
 
 def call_genPrerole(info):
     command = ["python", SCRIPT_FULLPATH]
@@ -49,8 +45,6 @@
         else:
             raise ValueError("unexpected datatype")
 
-    command += EXTRA_ARGS
-
     process = Popen(command)
     returncode = process.wait()
     if returncode != 0: