fix rename miss.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@781 4e526526-5e11-4fc0-8910-f8fd03428081

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

diff --git a/rec10/trunk/src/tv2audio.py b/rec10/trunk/src/tv2audio.py
index fc5335c..fd8e124 100644 (file)
--- a/rec10/trunk/src/tv2audio.py
+++ b/rec10/trunk/src/tv2audio.py
@@ -43,7 +43,7 @@ def wav2mp3_lame(pin,pout):
     recdblist.addLog(pin, txt, u"Wav2aac_Lameログ-詳細")\r
 def ts2single_audio(pts,opts):\r
     paac=pts.replace(".ts",".aac")\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     e0=ffmpeg+" -i \""+pts+"\" -y -vn -f aac -acodec copy \""+paac+"\""\r
     p0=subprocess.Popen(e0,shell=True)\r
     os.waitpid(p0.pid, 0)\r
@@ -114,7 +114,7 @@ def ts2single_audio(pts,opts):
             if not os.path.exists(pts.replace(".ts",".mp3")):\r
                 ts2single_fp_BonTsDemux(pts,opts)\r
 def ts2singlewav(pts,opts):\r
-    bontsdemux = configreader.getPathSetting('bontsdemux')\r
+    bontsdemux = configreader.getConfPath('bontsdemux')\r
     bonpin = "Z:\\" + pts[1:]\r
     outf = os.path.splitext(pts)[0]\r
     bonpout = "Z:\\" + outf[1:]\r
@@ -128,7 +128,7 @@ def ts2singlewav(pts,opts):
     recdblist.addCommandLog(ots, u"BonTsDemux 音声取り出し", exe, logt)\r
 def ts2single_mp3_ffmpeg(pts):\r
     pmp3=pts.replace(".ts",".mp3")\r
-    ffmpeg=configreader.getPathSetting("ffmpeg")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
     e0=ffmpeg+" -i \""+pts+"\" -y -vn -ab 128k \""+pmp3+"\""\r
     p0=subprocess.Popen(e0,shell=True)\r
     os.waitpid(p0.pid, 0)\r
@@ -141,7 +141,7 @@ def ts2single_mp3_ffmpeg(pts):
 def ts2single_fp_BonTsDemux(pts,opts):\r
     useNero=0\r
     try:\r
-        if configreader.getPathSetting("useNeroAAC")=="1" and os.path.exists(configreader.getPathSetting("NeroAAC")):\r
+        if configreader.getConfPath("useNeroAAC")=="1" and os.path.exists(configreader.getConfPath("NeroAAC")):\r
             useNero=1\r
     except:\r
         useNero=0\r
@@ -163,8 +163,8 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     """\r
     delay is string\r
     """\r
-    bontsdemux = configreader.getPathSetting('bontsdemux')\r
-    wine = configreader.getPathSetting('wine')\r
+    bontsdemux = configreader.getConfPath('bontsdemux')\r
+    wine = configreader.getConfPath('wine')\r
     bonpin = "Z:\\" + pin[1:]\r
     outf = os.path.splitext(pin)[0]\r
     bonpout = "Z:\\" + outf[1:]\r
@@ -196,7 +196,7 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     ffpout22=ffpout2.replace(".wav",".mp3")\r
     useNero=0\r
     try:\r
-        if configreader.getPathSetting("useNeroAAC")=="1" and os.path.exists(configreader.getPathSetting("NeroAAC")):\r
+        if configreader.getConfPath("useNeroAAC")=="1" and os.path.exists(configreader.getConfPath("NeroAAC")):\r
             useNero=1\r
     except:\r
         useNero=0\r
@@ -212,8 +212,8 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     os.remove(ffpout1)\r
     os.remove(ffpout2)\r
 def ts2pentaaudio_BonTsDemux(pin, delay,opts):\r
-    bontsdemux = configreader.getPathSetting('bontsdemux')\r
-    wine = configreader.getPathSetting('wine')\r
+    bontsdemux = configreader.getConfPath('bontsdemux')\r
+    wine = configreader.getConfPath('wine')\r
     bonpin = "Z:\\" + pin[1:]\r
     outf = os.path.splitext(pin)[0]\r
     bonpout = "Z:\\" + outf[1:]\r
@@ -240,7 +240,7 @@ def ts2pentaaudio_BonTsDemux(pin, delay,opts):
     ffpout21=ffpout1.replace(".wav",".mp3")\r
     useNero=0\r
     try:\r
-        if configreader.getPathSetting("useNeroAAC")=="1" and os.path.exists(configreader.getPathSetting("NeroAAC")):\r
+        if configreader.getConfPath("useNeroAAC")=="1" and os.path.exists(configreader.getConfPath("NeroAAC")):\r
             useNero=1\r
     except:\r
         useNero=0\r

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 85ddc8e..1a410fa 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -74,7 +74,7 @@ def b252ts(pout, ch, csch):
         except:
             ""
 def tv2b25ts(pout, ch, time):
-    exe = configreader.getPathSetting('recpt1')
+    exe = configreader.getConfPath('recpt1')
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
         status.changeBSCSRecording(1)
     else:
@@ -91,26 +91,26 @@ def tv2b25ts(pout, ch, time):
     else:
         status.changeTERecording(-1)
 def tv2b25ts_b25(pout, ch, time):
-    exe = configreader.getPathSetting('recpt1')
+    exe = configreader.getConfPath('recpt1')
     doexe = exe + ' --b25 ' + ch + ' ' + time + ' \'' + pout + '\''
     os.system(doexe)
 def b252tsmix(pin, pout):
     if not (os.path.exists(pout) and os.path.getsize(pin)>os.path.getsize(pout)*0.95 and os.path.getsize(pin)<os.path.getsize(pout)*1.05):
         exe=""
-        if configreader.getPathSetting('b25_remote')=="1":
+        if configreader.getConfPath('b25_remote')=="1":
             try:
-                exe = configreader.getPathSetting('b25_env')+" && "
+                exe = configreader.getConfPath('b25_env')+" && "
             except:
                 inst=u"b25_remoteがオンになっていますが、b25_envが設定されていないかコメントアウトされています。"
                 recdblist.addCommonlogEX(u"Error",u"b252tsmix(tv2ts.py)", "",inst)
-        exe = exe + "nice -n 17 " + configreader.getPathSetting('b25')
+        exe = exe + "nice -n 17 " + configreader.getConfPath('b25')
         doexe = exe + u' \"' + pin + u'\" \"' + pout + u'\"'
         recdblist.printutf8(doexe)
         txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
         recdblist.addLog(pin, doexe, u"b25ログ-コマンド")
         recdblist.addLog(pin, txt, u"b25ログ-詳細")
 def tsmix2ts(pin, pout, csch):#csch=0ならcsの処理をしない
-    doexe = configreader.getPathSetting("tssplitter") + " \""+ pin + "\" \""+ pout + "\" " + str(csch)
+    doexe = configreader.getConfPath("tssplitter") + " \""+ pin + "\" \""+ pout + "\" " + str(csch)
     doexe = "nice -n 18 " + doexe
     os.environ['LANG']="ja_JP.UTF-8"
     txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')