From: gn64_jp Date: Fri, 10 Dec 2010 05:48:08 +0000 (+0000) Subject: remove error log. X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=commitdiff_plain;h=a5d7d0b458dc29b95244a25f15d3bfb8865cdd90 remove error log. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@793 4e526526-5e11-4fc0-8910-f8fd03428081 --- diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py index be061d0..567e0ea 100644 --- a/rec10/trunk/src/ts2epg.py +++ b/rec10/trunk/src/ts2epg.py @@ -42,6 +42,6 @@ def writeEpgXMLTime(pout, ch ,times): exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " + mode + " " + pout + ".ts " + pout recdblist.printutf8(exe) recdblist.addCommonlogEX(u"通常", "write_time(ts2epg.py)", exe,"",log_level=500) - os.system(exe) + unicode(commands.getoutput(exe),'utf-8','ignore') time.sleep(10) diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py index 2a72db9..824b357 100644 --- a/rec10/trunk/src/ts2x264.py +++ b/rec10/trunk/src/ts2x264.py @@ -169,7 +169,7 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1): temptime=temptime % 9697 random.jumpahead(temptime) streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 99999999))) - os.system(u"mkfifo "+streampath) + unicode(commands.getoutput(u"mkfifo "+streampath),'utf-8','ignore') encexe=mencoder+u" \""+pin+u"\" -vfm ffmpeg -quiet "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" & " encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf) #encexe=encexe+u" nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u" --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize @@ -180,7 +180,7 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1): txt=unicode(commands.getoutput(encexe.encode('utf-8')),'utf-8','ignore') except: "" - os.system("rm "+streampath) + os.remove(streampath) recdblist.addCommandLog(pin, u"Mencoder", encexe, txt) def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1): """ diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py index 3855727..dc0fac0 100644 --- a/rec10/trunk/src/tv2ts.py +++ b/rec10/trunk/src/tv2ts.py @@ -91,10 +91,6 @@ def tv2b25ts(pout, ch, time): status.changeBSCSRecording(-1) else: status.changeTERecording(-1) -def tv2b25ts_b25(pout, ch, time): - exe = configreader.getConfPath('recpt1') - doexe = exe + ' --b25 ' + ch + ' ' + time + ' \'' + pout + '\'' - os.system(doexe) def b252tsmix(pin, pout): if not (os.path.exists(pout) and os.path.getsize(pin)>os.path.getsize(pout)*0.95 and os.path.getsize(pin)