fix rename miss.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index c331210..d89bfc8 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -186,7 +186,7 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     """\r
 \r
     """\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     fps=u"-r 29.970030 "\r
     x264fps="30000/1001"\r
     x264streamsize=""\r
@@ -270,7 +270,7 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         ""\r
     recdblist.addCommandLog(pin, u"FFmpeg動画エンコード", exe, txt)\r
 def getMovieBaseSize(pin):\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -i \""+pin+"\" 2>&1"\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
@@ -292,7 +292,7 @@ def getMovieBaseSize(pin):
                 sizeMaxY=tY\r
     return [sizeMaxX,sizeMaxY]\r
 def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
@@ -315,7 +315,7 @@ def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更された
     os.remove(pin+".size.ts")\r
     return [sizeMaxX,sizeMaxY]\r
 def getMoviePAR(pin):\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -i \""+pin+"\" 2>&1"\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
@@ -343,7 +343,7 @@ def getMoviePAR(pin):
                     pary=tEY\r
     return [parx,pary]\r
 def getMoviePAR2(pin):\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
@@ -372,7 +372,7 @@ def getMoviePAR2(pin):
     os.remove(pin+".size.ts")\r
     return [parx,pary]\r
 def getMovieDAR(pin):\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -i \""+pin+"\" 2>&1"\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
@@ -400,7 +400,7 @@ def getMovieDAR(pin):
                     dary=tEY\r
     return [darx,dary]\r
 def getMovieDAR2(pin):\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
@@ -442,7 +442,7 @@ def getParSize(pin,y):
         tY=-1\r
     return [tX,tY]\r
 def getX264CoreVersion():\r
-    x264=configreader.getPathSetting("x264")\r
+    x264=configreader.getConfPath("x264")\r
     t1=commands.getoutput(x264+" --help|grep core")\r
     rT=re.compile(u"x264 core:(\d*)[\d]*.*\Z")\r
     rM=rT.match(t1)\r
@@ -451,7 +451,7 @@ def getX264CoreVersion():
         v=int(rM.group(1))\r
     return v\r
 def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsize,crf=-1,bitrate=0):\r
-    x264=configreader.getPathSetting("x264")\r
+    x264=configreader.getConfPath("x264")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     x264_sar="--sar "+sar\r
     x264preset=u"--preset "+preset\r