implement new BonTsDemux function.

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

diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index fc220e0..ec974e6 100644 (file)
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -84,7 +84,6 @@ def move():
     configwriter.setpath(u"mp4box", getpath(u"MP4Box"))
     configwriter.setpath(u"mencoder", getpath(u"mencoder"))
     configwriter.setpath(u"ffmpeg", getpath(u"ffmpeg"))
-    #configwriter.setpath(u"xvfb-run", getpath(u"xvfb-run"))
     configwriter.setpath(u"mkvmerge", getpath(u"mkvmerge"))
     configwriter.setpath(u"b25", getpath(u"b25"))
     printutf8(u"必須環境の設定が完了しました")

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index afbd787..4ef9379 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -10,7 +10,6 @@
 
 [必要コマンド]
 python(2.6にて動作確認)
-xvfb
 wine
 mencoder
 ffmpeg
@@ -67,6 +66,11 @@ chdata.pyを実行してください(python chdata.py)
 yukikaze.jp@gmail.com
 
 [History]
+0.9.5
+BonTsDemuxの最新版を使用するように変更
+それに伴い大幅な修正
+Xvfb依存の解消
+b25自動削除機能の改善
 10/04/02 0.9.4 release
 バグ修正
 インストーラーの大幅な改善

diff --git a/rec10/trunk/src/rec10.conf b/rec10/trunk/src/rec10.conf
index 530df38..211232c 100644 (file)
--- a/rec10/trunk/src/rec10.conf
+++ b/rec10/trunk/src/rec10.conf
@@ -1,7 +1,6 @@
 [path]
 recpt1 = /usr/local/bin/recpt1
 wine = /usr/bin/wine
-xvfb-run = /usr/local/share/rec10/tstools/xvfb-run
 x264 = /usr/bin/x264
 mencoder = /usr/bin/mencoder
 ffmpeg = /usr/bin/ffmpeg

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index 2129ea8..79876b2 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -100,11 +100,9 @@ def dualaudiots2avi(pin, pout):
     bonpin = "Z:\\" + pin[1:]
     outf = os.path.splitext(pin)[0]
     bonpout = "Z:\\" + outf[1:]
-    xvfb = configreader.getpath('xvfb-run')
     logpath=pin.replace("ts","log")
-    exe = 'wine ' + bontsdemux + " -i \"" + bonpin + "\" -delay 167 -nd -sound 0 -o \"" + bonpout + "\" -start -quit"
+    exe = 'wine ' + bontsdemux + " -nogui -i \"" + bonpin + "\" -delay 167 -nd -sound 0 -o \"" + bonpout + "\" "
     #recdblist.printutf8(exe)
-    exe = xvfb + ' -a ' + exe
     recdblist.printutf8(exe)
     os.system(exe.encode('utf-8'))
     ffpin1 = pin.replace("ts", "wav")
@@ -121,12 +119,10 @@ def dualaudio2sep(pin, delay):
     """
     bontsdemux = configreader.getpath('bontsdemux')
     wine = configreader.getpath('wine')
-    xvfb = configreader.getpath('xvfb-run')
     bonpin = "Z:\\" + pin[1:]
     outf = os.path.splitext(pin)[0]
     bonpout = "Z:\\" + outf[1:]
-    exe = wine + ' ' + bontsdemux + " -i \"" + bonpin + "\" -delay " + delay + " -nd -sound 1 -o \"" + bonpout + "\" -start -quit"
-    exe = xvfb + ' -a ' + exe
+    exe = wine + ' ' + bontsdemux + " -nogui -i \"" + bonpin + "\" -delay " + delay + " -nd -sound 1 -o \"" + bonpout + "\" "
     recdblist.printutf8(exe)
     txt=commands.getoutput(exe.encode('utf-8'))
     try:
@@ -140,8 +136,7 @@ def dualaudio2sep(pin, delay):
     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 + "\" -start -quit"
-    exe = xvfb + ' -a ' + exe
+    exe = 'wine ' + bontsdemux + " -nogui -i \"" + bonpin + "\" -delay " + delay + " -nd -sound 2 -encode Demux\(wav\) -o \"" + bonpout + "\""
     recdblist.printutf8(exe)
     txt=commands.getoutput(exe.encode('utf-8'))
     try:
@@ -173,12 +168,10 @@ def dualaudio2sep(pin, delay):
 def pentaaudio2sep(pin):
     bontsdemux = configreader.getpath('bontsdemux')
     wine = configreader.getpath('wine')
-    xvfb = configreader.getpath('xvfb-run')
     bonpin = "Z:\\" + pin[1:]
     outf = os.path.splitext(pin)[0]
     bonpout = "Z:\\" + outf[1:]
-    exe = wine + ' ' + bontsdemux + " -i \"" + bonpin + "\" -delay 167 -nd -sound 3 -o \"" + bonpout + "\" -start -quit"
-    exe = xvfb + ' -a ' + exe
+    exe = wine + ' ' + bontsdemux + " -nogui -i \"" + bonpin + "\" -delay 167 -nd -sound 3 -o \"" + bonpout + "\" -start -quit"
     recdblist.printutf8(exe)
     txt=commands.getoutput(exe.encode('utf-8'))
     try:
@@ -192,7 +185,6 @@ def pentaaudio2sep(pin):
     ffpout2 = ffpin + "_2.aac"
     shutil.move(ffpin1, ffpout1)
     exe = "ffmpeg -i '"+pin+"' -vn -f aac -acodec copy '"+ffpout2+"'"
-    exe = xvfb + ' -a ' + exe
     recdblist.printutf8(exe)
     txt=commands.getoutput(exe.encode('utf-8'))
     try:
@@ -212,8 +204,7 @@ def pentaaudio2sep(pin):
     else:
         tv2audio.wav2mp3_lame(ffpout1, ffpout21)
     if not os.path.exists(ffpout21):
-        exe = wine + ' ' + bontsdemux + " -i \"" + bonpin + "\" -delay 167 -nd -sound 0 -o \"" + bonpout + "\" -start -quit"
-        exe = xvfb + ' -a ' + exe
+        exe = wine + ' ' + bontsdemux + " -nogui -i \"" + bonpin + "\" -delay 167 -nd -sound 0 -o \"" + bonpout + "\" "
         recdblist.printutf8(exe)
         txt=commands.getoutput(exe.encode('utf-8'))
         try:
@@ -234,11 +225,9 @@ def pentaaudio2sep(pin):
 def pentaaudiots2avi(pin, pout):
     bontsdemux = configreader.getpath('bontsdemux')
     bonpin = "Z:\\" + pin[1:]
-    xvfb = configreader.getpath('xvfb-run')
     outf = os.path.splitext(pin)[0]
     bonpout = "Z:\\" + outf[1:]
-    exe = 'wine ' + bontsdemux + " -i \"" + bonpin + "\" -delay 167 -nd -sound 3 -o \"" + bonpout + "\" -start -quit"
-    exe = xvfb + ' -a ' + exe
+    exe = 'wine ' + bontsdemux + " -nogui -i \"" + bonpin + "\" -delay 167 -nd -sound 3 -o \"" + bonpout + "\" -start -quit"
     recdblist.printutf8(exe)
     txt=u"Cmd : "+exe+"\n"
     txt=txt+commands.getoutput(exe.encode('utf-8'))