X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Fts2epg.py;h=43d911f2fa34afe6666d39e424293f34582f4052;hb=834ad72ed635ce665792b0d9c1ebf98dd0897d6b;hp=65e7f1e0836ffb0f3aa23ec8963244a74ba496fd;hpb=6212cf33addf899607f1c75e17b153861bc2e884;p=rec10%2Frec10-git.git

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 65e7f1e..43d911f 100644
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -23,7 +23,13 @@ def writeEpgXML(pout, ch):
     elif len(ch)>2:
         timet = "240"
     writeEpgXMLTime(pout, ch ,timet)
-def writeEpgXMLTime(pout, ch ,times):
+def writeLogoEpgXML(pout, ch):
+    """
+    tsを取得してepgの入ったxmlとして書き出す
+    """
+    timet = "1200"
+    writeEpgXMLTime(pout, ch ,timet,islogo=1)
+def writeEpgXMLTime(pout, ch ,times,islogo=0):
     """
     指定された時間分tsを取得してepgの入ったxmlとして書き出す
     """
@@ -39,8 +45,11 @@ def writeEpgXMLTime(pout, ch ,times):
     if os.access(pout + ".ts", os.F_OK):
         os.remove(pout + ".ts")
     time.sleep(10)
-    tv2ts.tv2tsmix(pout + ".ts", ch, timet)
-    exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " + mode + " " + pout + ".ts " + pout
+    tv2ts.tv2b25ts(pout+ ".ts", ch, times)
+    logoopt=""
+    if islogo==1:
+        logoopt="/LOGO "
+    exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " +logoopt+ mode + " " + pout + ".ts " + pout
     recdblist.printutf8(exe)
     recdblist.addCommonlogEX(u"通常", "write_time(ts2epg.py)", exe,"",log_level=500)
     unicode(commands.getoutput(exe),'utf-8','ignore')