OSDN Git Service

fix recording in DVB mode.
authorgn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Fri, 13 Jan 2012 11:57:26 +0000 (11:57 +0000)
committergn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Fri, 13 Jan 2012 11:57:26 +0000 (11:57 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@893 4e526526-5e11-4fc0-8910-f8fd03428081

rec10/trunk/src/install.py
rec10/trunk/src/recording_earth_pt1.py

index 1648e90..25477bd 100644 (file)
@@ -124,7 +124,7 @@ def move():
     else:\r
         useBSCS="1"\r
     printutf8(u"ドライバの設定に入ります")\r
-    printutf8(u"DTV版のドライバを使用しますか(earth_pt1など。chardev版を使う場合はNo)(5/"+str(maxn)+")")\r
+    printutf8(u"DVB版のドライバを使用しますか(earth_pt1など。chardev版を使う場合はNo)(5/"+str(maxn)+")")\r
     useDVB=raw_input("[y/N]:")\r
     if useDVB=="Y" or useDVB=="y" or useDVB=="yes" or useDVB=="YES":\r
         useDVB="1"\r
index f6081c9..ccd7adb 100644 (file)
@@ -71,14 +71,14 @@ def record(channel,tsid,out,timelength,decode=1):
     adapt=getActiveAdapter(channel)
     if adapt!=None:
         tunecmd=configreader.getConfDVB("DVBtune")+u" "+adapt+u" "+channel2freq(channel)+u" "+tsid
-        reccmd=u"/bin/cat "+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0 > "+out
+        reccmd=u"/bin/cat \""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\" > "+out
         if decode==1:
-            reccmd=configreader.getConfPath("b25")+u" -v 0 "+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0 "+out
+            reccmd=configreader.getConfPath("b25")+u" -v 0 \""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\" \""+out+"\""
         recdblist.addLog(out, tunecmd+"\n"+reccmd, "record(DVB)",100)
         p1=subprocess.Popen([configreader.getConfDVB("DVBtune"),adapt,channel2freq(channel),tsid])
         time.sleep(0.2)
         if decode==1:
-            p2=subprocess.Popen([configreader.getConfPath("b25"),u"-v 0",configreader.getConfDVB("DVBadapter")+adapt+"/dvr0",out],preexec_fn=os.setsid,bufsize=-1)
+            p2=subprocess.Popen([configreader.getConfPath("b25"),u"-v 0",u"\""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\"","\""+out+"\""],preexec_fn=os.setsid,bufsize=-1)
         else:
             p2=subprocess.Popen(reccmd,shell=True,preexec_fn=os.setsid,bufsize=-1)
         time.sleep(float(timelength))