simplify codes.

[rec10/rec10-git.git] / rec10 / trunk / src / tv2mkv.py

diff --git a/rec10/trunk/src/tv2mkv.py b/rec10/trunk/src/tv2mkv.py
index ee0004e..3516e25 100644 (file)
--- a/rec10/trunk/src/tv2mkv.py
+++ b/rec10/trunk/src/tv2mkv.py
@@ -31,6 +31,7 @@ def raw2mkv(pin,pout,opt):#x264
     title=os.path.split(pout)[1]
     title=os.path.splitext(title)[0]
     duration="--default-duration 0:30000/1001fps "
+    ffmpeg=configreader.getpath("ffmpeg")
     isdualaac=0
     ispentaaudio=0
     if re.search("a",opt):
@@ -95,7 +96,7 @@ def raw2mkv(pin,pout,opt):#x264
         pints=pin.replace(".264",".ts")
         pinaac=pin.replace(".264",".aac")
         e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""
-        e1="ffmpeg -i \""+pints+"\" -vn -f aac -acodec copy \""+pinaac+"\""
+        e1=ffmpeg+" -i \""+pints+"\" -vn -f aac -acodec copy \""+pinaac+"\""
         e2=exe +" -o \""+pout+u"\" --forced-track 0:no "+duration+"-d 0 -A -S \""+pin+"\" --forced-track 0:no -a 0 -D -S \""+pinaac+"\" --track-order 0:0,1:0"
         e2s=exe +" -o \""+pout+u"\" --forced-track 0:no "+duration+"-d 0 -A -S \""+pin+"\" --forced-track 0:no -a 0 -D -S \""+pinaac+"\" --forced-track 0:no -s 0 -D -A \""+pincap+"\" --track-order 0:0,1:0,2:0"
         if os.path.isfile(cap2ass):
@@ -175,7 +176,7 @@ def avi2mkv(pin,pout,opt):
         pints=pin.replace(".avi",".ts")
         pinaac=pin.replace(".avi",".aac")
         e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""
-        e1="ffmpeg -i \""+pints+"\" -vn -f aac -acodec copy \""+pinaac+"\""
+        e1=ffmpeg+u" -i \""+pints+u"\" -vn -f aac -acodec copy \""+pinaac+"\""
         e2=exe +" -o \""+pout+u"\"  --forced-track 0:no -d 0 -A -S \""+pin+"\" --sync 0:0 --forced-track 0:no -a 0 -D -S \""+pinaac+"\" --track-order 0:0,1:0"
         e2s=exe +" -o \""+pout+u"\"  --forced-track 0:no -d 0 -A -S \""+pin+"\" --sync 0:0 --forced-track 0:no -a 0 -D -S \""+pinaac+"\" --forced-track 0:no -s 0 -D -A \""+pincap+"\" --track-order 0:0,1:0,2:0"
         if os.path.isfile(cap2ass):