fix csch bug.

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

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index ac9063a..02b3dff 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -1,3 +1,4 @@
+import tv2ts

 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools


@@ -43,4 +44,4 @@ recpath = "/home/ftpusr/ftp-tmp/Recording/"
 ftpusr = "/home/ftpusr/ftp-tmp"
 recordedpath = u"/home/ftpusr/ftp-video"
 if __name__ == "__main__":
 ftpusr = "/home/ftpusr/ftp-tmp"
 recordedpath = u"/home/ftpusr/ftp-video"
 if __name__ == "__main__":

-    recque.searchRecQue(recpath)
\ No newline at end of file
+    ""
\ No newline at end of file

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index 5f597e9..1228fac 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -56,8 +56,10 @@ def b252ts(pout, chtxt, btime, etime, opt):
     status.changeB25Decoding(1)\r
     try:\r
         try:\r
     status.changeB25Decoding(1)\r
     try:\r
         try:\r

-            ch=chtxt.split("_")[0]\r
-            csch=chtxt.split("_")[1]\r
+            chs=chdb.searchCHFromChtxt(chtxt)\r
+            ch=chs['ch']\r
+            csch=chs['csch']\r
+            #print [ch,csch,chtxt]\r

         except:\r
             ch=0\r
             csch=0\r
         except:\r
             ch=0\r
             csch=0\r

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 54009db..9828d3b 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -59,7 +59,7 @@ def tv2ts(pout, ch, csch, time):
 def b252ts(pout, ch, csch):
     b252tsmix(pout + ".b25", pout + ".tsmix")
     tch=u"0"
 def b252ts(pout, ch, csch):
     b252tsmix(pout + ".b25", pout + ".tsmix")
     tch=u"0"

-    if ch.replace(" ","").isdigit():
+    if ch.replace(" ","").replace("CS","").isdigit():

         if csch!=u"0":
             tch=csch
         elif ch==u"101":
         if csch!=u"0":
             tch=csch
         elif ch==u"101":