make 0.9.9.2

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

diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index 1462891..c2c9135 100644 (file)
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -173,11 +173,11 @@ def move():
     configwriter.setTempConfEnv("x264_preset", preset)\r
     printutf8(u"保存するコンテナの設定(11/"+str(maxn)+")")\r
     printutf8(u"MP4を標準にしますか(もしくはMKVが使えます)")\r
-    useMP4=raw_input("[y/N]:")\r
-    if useMP4=="Y" or useMP4 == "y" :\r
-        useMP4="1"\r
-    else:\r
+    useMP4=raw_input("[Y/n]:")\r
+    if useMP4=="N" or useMP4 == "n" :\r
         useMP4="0"\r
+    else:\r
+        useMP4="1"\r
     configwriter.setTempConfEnv("make_mp4", useMP4)\r
     printutf8(u"TSファイルの自動削除(12/"+str(maxn)+")")\r
     printutf8(u"中間体のtsファイルを削除しますか")\r

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 9c25f24..497dedf 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -227,10 +227,10 @@ def task():
                 if pid > 0:#親プロセスの場合
                     ""
                 else:
-                    makeMP4=0
+                    makeMP4=1
                     try:
-                        if configreader.getConfEnv("make_mp4")==1:
-                            makeMP4=1
+                        if configreader.getConfEnv("make_mp4")==0:
+                            makeMP4=0
                     except:
                         ""
                     if re.search("m", opt):
@@ -242,7 +242,9 @@ def task():
                     if makeMP4==1:
                         tv2mp4.raw2mp4(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mp4"),opt)
                     else:
-                        tv2mkv.raw2mkv(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mkv"),opt)
+                        tv2mp4.raw2mp4(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mp4"),opt)
+                        tv2mkv.mp42mkv(os.path.join(recpath,title+".mp4"), os.path.join(recpath,title+".mkv"))
+                        os.remove(os.path.join(recpath,title+".mp4"))
                     recdb.deleteReckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
         elif task["type"] == recdblist.REC_AVI_TO_MP4: