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