OSDN Git Service

(root) / rec10 / rec10-git.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
change function name.
[rec10/rec10-git.git] / rec10 / trunk / src / tv2audio.py
diff --git a/rec10/trunk/src/tv2audio.py b/rec10/trunk/src/tv2audio.py
index b07fc9f..55be78d 100644 (file)
--- a/rec10/trunk/src/tv2audio.py
+++ b/rec10/trunk/src/tv2audio.py
@@ -18,19 +18,19 @@ import recdblist
 
 def wav2aac_nero(pin,pout):
     os.environ['LANG']="ja_JP.UTF-8"
-    neroaac=configreader.getpath('NeroAAC')
+    neroaac=configreader.getPathSetting('NeroAAC')
     exe=neroaac+" -br 128000 -2pass -if \""+pin+"\" -of \""+pout+"\""
     try:
         txt=commands.getoutput(exe.encode('utf-8'))
-        recdblist.addlog(pin, exe, u"Wav2aac_Neroログ-コマンド")
-        recdblist.addlog(pin, txt, u"Wav2aac_Neroログ-詳細")
+        recdblist.addLog(pin, exe, u"Wav2aac_Neroログ-コマンド")
+        recdblist.addLog(pin, txt, u"Wav2aac_Neroログ-詳細")
     except:
         if not os.path.exists(pout):
             lame="lame"
             exe=lame+" -b 128 \""+pin+"\" \""+pout+"\""
             txt=commands.getoutput(exe.encode('utf-8'))
-            recdblist.addlog(pin, exe, u"Wav2aac_Lameログ-コマンド")
-            recdblist.addlog(pin, txt, u"Wav2aac_Lameログ-詳細")
+            recdblist.addLog(pin, exe, u"Wav2aac_Lameログ-コマンド")
+            recdblist.addLog(pin, txt, u"Wav2aac_Lameログ-詳細")
 def wav2mp3_lame(pin,pout):
     os.environ['LANG']="ja_JP.UTF-8"
     lame="lame"
@@ -39,11 +39,11 @@ def wav2mp3_lame(pin,pout):
         txt=commands.getoutput(exe.encode('utf-8'))
     except:
         ""
-    recdblist.addlog(pin, exe, u"Wav2aac_Lameログ-コマンド")
-    recdblist.addlog(pin, txt, u"Wav2aac_Lameログ-詳細")
+    recdblist.addLog(pin, exe, u"Wav2aac_Lameログ-コマンド")
+    recdblist.addLog(pin, txt, u"Wav2aac_Lameログ-詳細")
 def ts2single_audio(pts,opts):
     paac=pts.replace(".ts",".aac")
-    ffmpeg=configreader.getpath("ffmpeg")
+    ffmpeg=configreader.getPathSetting("ffmpeg")
     e0=ffmpeg+" -i \""+pts+"\" -y -vn -f aac -acodec copy \""+paac+"\""
     p0=subprocess.Popen(e0,shell=True)
     os.waitpid(p0.pid, 0)
@@ -52,11 +52,11 @@ def ts2single_audio(pts,opts):
             if os.path.getsize(paac)<1000:#1mで1kb以下の場合自動で終了
                 try:
                     logt=unicode(p0.communicate()[0], "UTF-8")
-                    recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
-                    recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                    recdblist.addLog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                    recdblist.addLog(pts,logt, "FFmpeg音声取り出しログ-詳細")
                 except:
                     ""
-                recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
+                recdblist.addCommonlogEX("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
                 os.kill(p0.pid,signal.SIGKILL)
                 os.remove(paac)
                 ts2single_mp3_ffmpeg(pts)
@@ -64,16 +64,16 @@ def ts2single_audio(pts,opts):
                     ts2single_fp_BonTsDemux(pts,opts)
             else:
                 logt=unicode(p0.communicate()[0], "UTF-8")
-                recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
-                recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                recdblist.addLog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                recdblist.addLog(pts,logt, "FFmpeg音声取り出しログ-詳細")
         else:
             try:
                 logt=unicode(p0.communicate()[0], "UTF-8")
-                recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
-                recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                recdblist.addLog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                recdblist.addLog(pts,logt, "FFmpeg音声取り出しログ-詳細")
             except:
                 ""
-            recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
+            recdblist.addCommonlogEX("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
             try:
                 os.kill(p0.pid,signal.SIGKILL)
             except:
@@ -86,11 +86,11 @@ def ts2single_audio(pts,opts):
             if os.path.getsize(paac)<1000:#1mで1kb以下の場合自動で終了
                 try:
                     logt=unicode(p0.communicate()[0], "UTF-8")
-                    recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
-                    recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                    recdblist.addLog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                    recdblist.addLog(pts,logt, "FFmpeg音声取り出しログ-詳細")
                 except:
                     ""
-                recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
+                recdblist.addCommonlogEX("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
                 os.remove(paac)
                 ts2single_mp3_ffmpeg(pts)
                 if not os.path.exists(pts.replace(".ts",".mp3")):
@@ -98,23 +98,23 @@ def ts2single_audio(pts,opts):
             else:
                 try:
                     logt=unicode(p0.communicate()[0], "UTF-8")
-                    recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
-                    recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                    recdblist.addLog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                    recdblist.addLog(pts,logt, "FFmpeg音声取り出しログ-詳細")
                 except:
                     ""
         else:
             try:
                 logt=unicode(p0.communicate()[0], "UTF-8")
-                recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
-                recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                recdblist.addLog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                recdblist.addLog(pts,logt, "FFmpeg音声取り出しログ-詳細")
             except:
                 ""
-            recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
+            recdblist.addCommonlogEX("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
             ts2single_mp3_ffmpeg(pts)
             if not os.path.exists(pts.replace(".ts",".mp3")):
                 ts2single_fp_BonTsDemux(pts,opts)
 def ts2singlewav(pts,opts):
-    bontsdemux = configreader.getpath('bontsdemux')
+    bontsdemux = configreader.getPathSetting('bontsdemux')
     bonpin = "Z:\\" + pts[1:]
     outf = os.path.splitext(pts)[0]
     bonpout = "Z:\\" + outf[1:]
@@ -128,20 +128,20 @@ def ts2singlewav(pts,opts):
     recdblist.addCommandLog(ots, u"BonTsDemux 音声取り出し", exe, logt)
 def ts2single_mp3_ffmpeg(pts):
     pmp3=pts.replace(".ts",".mp3")
-    ffmpeg=configreader.getpath("ffmpeg")
+    ffmpeg=configreader.getPathSetting("ffmpeg")
     e0=ffmpeg+" -i \""+pts+"\" -y -vn -ab 128k \""+pmp3+"\""
     p0=subprocess.Popen(e0,shell=True)
     os.waitpid(p0.pid, 0)
     try:
         logt=unicode(p0.communicate()[0], "UTF-8")
-        recdblist.addlog(pts,e0, "FFmpeg_mp3音声取り出しログ-コマンド")
-        recdblist.addlog(pts,logt, "FFmpeg_mp3音声取り出しログ-詳細")
+        recdblist.addLog(pts,e0, "FFmpeg_mp3音声取り出しログ-コマンド")
+        recdblist.addLog(pts,logt, "FFmpeg_mp3音声取り出しログ-詳細")
     except:
         ""
 def ts2single_fp_BonTsDemux(pts,opts):
     useNero=0
     try:
-        if configreader.getpath("useNeroAAC")=="1" and os.path.exists(configreader.getpath("NeroAAC")):
+        if configreader.getPathSetting("useNeroAAC")=="1" and os.path.exists(configreader.getPathSetting("NeroAAC")):
             useNero=1
     except:
         useNero=0
@@ -163,8 +163,8 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     """
     delay is string
     """
-    bontsdemux = configreader.getpath('bontsdemux')
-    wine = configreader.getpath('wine')
+    bontsdemux = configreader.getPathSetting('bontsdemux')
+    wine = configreader.getPathSetting('wine')
     bonpin = "Z:\\" + pin[1:]
     outf = os.path.splitext(pin)[0]
     bonpout = "Z:\\" + outf[1:]
@@ -182,7 +182,7 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     ffpout2 = ffpin + "_2.wav"
     ffpout3 = ffpin + ".m2v"
     shutil.move(ffpin1, ffpout1)
-    exe = 'wine ' + bontsdemux + " -i \"" + bonpin + "\" -delay " + delay + " -nd  -sound 2 -encode Demux\(wav\) -o \"" + bonpout + "\""
+    exe = wine + ' ' + bontsdemux + " -i \"" + bonpin + "\" -delay " + delay + " -nd -sound 2 -encode Demux\(wav\) -o \"" + bonpout + "\""
     recdblist.printutf8(exe)
     txt=commands.getoutput(exe.encode('utf-8'))
     try:
@@ -196,7 +196,7 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     ffpout22=ffpout2.replace(".wav",".mp3")
     useNero=0
     try:
-        if configreader.getpath("useNeroAAC")=="1" and os.path.exists(configreader.getpath("NeroAAC")):
+        if configreader.getPathSetting("useNeroAAC")=="1" and os.path.exists(configreader.getPathSetting("NeroAAC")):
             useNero=1
     except:
         useNero=0
@@ -212,8 +212,8 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     os.remove(ffpout1)
     os.remove(ffpout2)
 def ts2pentaaudio_BonTsDemux(pin, delay,opts):
-    bontsdemux = configreader.getpath('bontsdemux')
-    wine = configreader.getpath('wine')
+    bontsdemux = configreader.getPathSetting('bontsdemux')
+    wine = configreader.getPathSetting('wine')
     bonpin = "Z:\\" + pin[1:]
     outf = os.path.splitext(pin)[0]
     bonpout = "Z:\\" + outf[1:]
@@ -240,7 +240,7 @@ def ts2pentaaudio_BonTsDemux(pin, delay,opts):
     ffpout21=ffpout1.replace(".wav",".mp3")
     useNero=0
     try:
-        if configreader.getpath("useNeroAAC")=="1" and os.path.exists(configreader.getpath("NeroAAC")):
+        if configreader.getPathSetting("useNeroAAC")=="1" and os.path.exists(configreader.getPathSetting("NeroAAC")):
             useNero=1
     except:
         useNero=0
rec10 git
About OSDN
Find Software
Develop Software
Help