From 17761db40448fd8286420014018fbbcb0f864919 Mon Sep 17 00:00:00 2001 From: gn64_jp Date: Thu, 3 Dec 2009 22:56:59 +0000 Subject: [PATCH] fix bug. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@297 4e526526-5e11-4fc0-8910-f8fd03428081 --- rec10/trunk/src/configreader.py | 6 +++--- rec10/trunk/src/tv2avi.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rec10/trunk/src/configreader.py b/rec10/trunk/src/configreader.py index 8d6e05b..db32e88 100644 --- a/rec10/trunk/src/configreader.py +++ b/rec10/trunk/src/configreader.py @@ -7,14 +7,14 @@ import os import os.path mypath = str(os.path.dirname(os.path.abspath(__file__))) confp = ConfigParser.SafeConfigParser() -Conf = 'config.ini' +Conf = 'rec10.conf' confpath="" if os.path.exists(os.path.join(mypath,Conf)): confpath=os.path.join(mypath,Conf) elif os.path.exists(os.path.join("/etc","rec10.conf")): confpath=os.path.join("/etc","rec10.conf") -elif os.path.exists(os.path.join("/etc/rec10","config.ini")): - confpath=os.path.join("/etc/rec10","config.ini") +elif os.path.exists(os.path.join("/etc/rec10","rec10.conf")): + confpath=os.path.join("/etc/rec10","rec10.conf") confp.read(confpath) def getpath(string): global confp diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py index ab2e974..6ca0afb 100644 --- a/rec10/trunk/src/tv2avi.py +++ b/rec10/trunk/src/tv2avi.py @@ -225,13 +225,13 @@ def dualaudiots2avi(pin, pout): #recdblist.printutf8(exe) exe = xvfb + ' -a ' + exe recdblist.printutf8(exe) - os.system(exe) + os.system(exe.encode('utf-8')) ffpin1 = pin.replace("ts", "wav") ffpin2 = pin.replace("ts", "m2v") exe = "ffmpeg -y -i \'" + ffpin1 + "\' -i \'" + ffpin2 + "\' -r 29.97 -vsync 200 -vcodec copy -acodec libmp3lame -async 200 -ab 128k -f avi \'" + pout + "\'" recdblist.printutf8(exe) #commands.getoutput(exe) - os.system(exe) + os.system(exe.encode('utf-8')) os.remove(ffpin1) os.remove(ffpin2) def dualaudio2sep(pin, pout, delay): -- 2.11.0