fix some bug.

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

diff --git a/rec10/trunk/src/configwriter.py b/rec10/trunk/src/configwriter.py
index 080d582..0545778 100644 (file)
--- a/rec10/trunk/src/configwriter.py
+++ b/rec10/trunk/src/configwriter.py
@@ -29,6 +29,7 @@ def setenv(option,value):
     global confp
     return confp.set('env',option,value)
 def writeconf():
+    global confp
     f=open(confpath,"w")
     confp.write(f)
     f.close

diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index 33c33c6..dc9c1fa 100644 (file)
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -73,13 +73,13 @@ def getpath(cmd):
 def move():
     useB=0
     path = str(os.path.dirname(os.path.abspath(__file__)))
-    recdblist.printutf8(u"rec10 ver 0.9.3 installer.")
+    recdblist.printutf8(u"rec10 ver 0.9.4 installer.")
     recdblist.printutf8(u"rec10のインストールを開始します。")
     maxn=14
     configwriter.setpath(u"wine", getpath(u"wine"))
     configwriter.setpath(u"recpt1", getpath(u"recpt1"))
     configwriter.setpath(u"x264", getpath(u"x264"))
-    configwriter.setpath(u"MP4Box", getpath(u"MP4Box"))
+    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"))

diff --git a/rec10/trunk/src/rec10.conf b/rec10/trunk/src/rec10.conf
index 1d5ba56..530df38 100644 (file)
--- a/rec10/trunk/src/rec10.conf
+++ b/rec10/trunk/src/rec10.conf
@@ -22,8 +22,8 @@ tmp = /tmp/rec10
 epgdump = /usr/local/bin/epgdump
 tssplitter = /usr/bin/java -jar /usr/local/share/rec10/tstools/jTsSplitter.jar
 bontsdemux = /usr/local/share/rec10/tstools/BonTsDemux.exe
-Caption2Ass = /usr/local/share/rec10/tstools/Caption2Ass.exe
-MP4Box = /usr/bin/MP4Box
+caption2ass = /usr/local/share/rec10/tstools/Caption2Ass.exe
+mp4box = /usr/bin/MP4Box
 mkvmerge = /usr/bin/mkvmerge
 mkvextract = /usr/bin/mkvextract
 gridserver_port=10910

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 6d63a58..9f18430 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -50,7 +50,7 @@ def raw2mp4(pin,pout,opt):
     if isdualaac==1:\r
         wineexe=configreader.getpath("wine")\r
         pincap=pin.replace(".264",".srt")\r
-        cap2ass=configreader.getpath("Caption2Ass")\r
+        cap2ass=configreader.getpath("caption2ass")\r
         pints=pin.replace(".264",".ts")\r
         paac1=pin.replace(".264","_1.aac")\r
         paac2=pin.replace(".264","_2.aac")\r
@@ -74,7 +74,7 @@ def raw2mp4(pin,pout,opt):
     elif ispentaaudio==1:\r
         wineexe=configreader.getpath("wine")\r
         pincap=pin.replace(".264",".srt")\r
-        cap2ass=configreader.getpath("Caption2Ass")\r
+        cap2ass=configreader.getpath("caption2ass")\r
         pints=pin.replace(".264",".ts")\r
         paac1=pin.replace(".264","_1.aac")\r
         paac2=pin.replace(".264","_2.aac")\r
@@ -98,7 +98,7 @@ def raw2mp4(pin,pout,opt):
     else:\r
         wineexe=configreader.getpath("wine")\r
         pincap=pin.replace(".264",".srt")\r
-        cap2ass=configreader.getpath("Caption2Ass")\r
+        cap2ass=configreader.getpath("caption2ass")\r
         pints=pin.replace(".264",".ts")\r
         pinaac=pin.replace(".264",".aac")\r
         e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""\r
@@ -120,8 +120,8 @@ def raw2mp4(pin,pout,opt):
                 deltitle(dir,title)\r
 def mkv2mp4(pin,pout):\r
     exeb = configreader.getpath(u"mkvextract")\r
-    exe = configreader.getpath(u"MP4Box")\r
-    dtsedit=configreader.getpath("DtsEdit")\r
+    exe = configreader.getpath(u"mp4Box")\r
+    #dtsedit=configreader.getpath("DtsEdit")\r
     wineexe=configreader.getpath("wine")\r
     dir=os.path.split(pin)[0]\r
     title=os.path.split(pin)[1]\r