fix rename miss.

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

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 4b231f8..f83f224 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -51,7 +51,7 @@ def raw2mp4(pin,pout,opt):
         duration="-fps 29.970030 "##ffmpegが24fpsに対応していないための措置\r
     if re.search("I",opt):\r
         duration="-fps 29.970030 "\r
-    exe = configreader.getPathSetting("mp4box")\r
+    exe = configreader.getConfPath("mp4box")\r
     txt=""\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     pints=pin.replace(".264",".ts")\r
@@ -64,14 +64,14 @@ def raw2mp4(pin,pout,opt):
     if status.getSettings_auto_del_tmp()==1:\r
         if os.path.exists(pout):\r
             if re.search(opt,"1") or re.search(opt,"2"):\r
-                auto_process.deltmpfile(dir, title, ".mp4")\r
+                auto_process.deleteTmpFile(dir, title, ".mp4")\r
             else:\r
-                auto_process.deltmpfile(dir, title, ".mp4")\r
+                auto_process.deleteTmpFile(dir, title, ".mp4")\r
 def mkv2mp4(pin,pout):\r
-    exeb = configreader.getPathSetting(u"mkvextract")\r
-    exe = configreader.getPath(u"mp4Box")\r
-    #dtsedit=configreader.getPath("DtsEdit")\r
-    wineexe=configreader.getPathSetting("wine")\r
+    exeb = configreader.getConfPath(u"mkvextract")\r
+    exe = configreader.getConfPath(u"mp4Box")\r
+    #dtsedit=configreader.getpath("DtsEdit")\r
+    wineexe=configreader.getConfPath("wine")\r
     dir=os.path.split(pin)[0]\r
     title=os.path.split(pin)[1]\r
     title=os.path.splitext(title)[0]\r
@@ -98,12 +98,12 @@ def mkv2mp4(pin,pout):
     time.sleep(10)\r
     if status.getSettings_auto_del_tmp()==1:\r
         if os.path.exists(pout):\r
-            auto_process.deltmpfile(dir, title, ".mp4")\r
+            auto_process.deleteTmpFile(dir, title, ".mp4")\r
 def addCaption(pts,pmp4):##字幕の追加を試みる。\r
-    wineexe=configreader.getPathSetting("wine")\r
+    wineexe=configreader.getConfPath("wine")\r
     pincap=pts.replace(".ts",".srt")\r
     try:\r
-        cap2ass=configreader.getPathSetting("caption2ass")\r
+        cap2ass=configreader.getConfPath("caption2ass")\r
     except:\r
         cap2ass=""\r
     if os.path.isfile(cap2ass):\r
@@ -121,11 +121,11 @@ def addCaption(pts,pmp4):##字幕の追加を試みる。
             recdblist.addlog(pts,logt, u"Captionログ-詳細")\r
         if os.path.exists(pincap):\r
             if os.path.getsize(pincap)>1000:\r
-                exe = configreader.getPathSetting("mp4box")\r
+                exe = configreader.getConfPath("mp4box")\r
                 e1s=exe +u" -add \""+pincap+"\" \""+pmp4+"\""\r
                 addmp4(pincap,pmp4,e1s)\r
 def addAudio(pts,pmp4,opts):#オプションに応じた音声の追加を行う\r
-    exe = configreader.getPathSetting("mp4box")\r
+    exe = configreader.getConfPath("mp4box")\r
     if re.search("d",opts) or re.search("5",opts):#二カ国語放送/5.1ch放送の場合\r
         paac1=pts.replace(".ts","_1.aac")\r
         paac2=pts.replace(".ts","_2.aac")\r
@@ -220,4 +220,4 @@ def execcomd(cmd):
         txt=txt+unicode(txt2,"utf-8")+"\n"\r
     except:\r
         ""\r
-    return txt
\ No newline at end of file
+    return txt\r