OSDN Git Service
(root)
/
rec10
/
rec10-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix caption2ass bug.
[rec10/rec10-git.git]
/
rec10
/
trunk
/
src
/
tv2mkv.py
diff --git
a/rec10/trunk/src/tv2mkv.py
b/rec10/trunk/src/tv2mkv.py
index
80251f8
..
01911d0
100644
(file)
--- a/
rec10/trunk/src/tv2mkv.py
+++ b/
rec10/trunk/src/tv2mkv.py
@@
-47,7
+47,10
@@
def raw2mkv(pin,pout,opt):#x264
if isdualaac==1:
wineexe=configreader.getpath("wine")
pincap=pin.replace(".264",".srt")
if isdualaac==1:
wineexe=configreader.getpath("wine")
pincap=pin.replace(".264",".srt")
- cap2ass=configreader.getpath("caption2ass")
+ try:
+ cap2ass=configreader.getpath("caption2ass")
+ except:
+ cap2ass=""
pints=pin.replace(".264",".ts")
paac1=pin.replace(".264","_1.aac")
paac2=pin.replace(".264","_2.aac")
pints=pin.replace(".264",".ts")
paac1=pin.replace(".264","_1.aac")
paac2=pin.replace(".264","_2.aac")
@@
-68,7
+71,10
@@
def raw2mkv(pin,pout,opt):#x264
elif ispentaaudio==1:
wineexe=configreader.getpath("wine")
pincap=pin.replace(".264",".srt")
elif ispentaaudio==1:
wineexe=configreader.getpath("wine")
pincap=pin.replace(".264",".srt")
- cap2ass=configreader.getpath("caption2ass")
+ try:
+ cap2ass=configreader.getpath("caption2ass")
+ except:
+ cap2ass=""
pints=pin.replace(".264",".ts")
paac1=pin.replace(".264","_1.aac")
paac2=pin.replace(".264","_2.aac")
pints=pin.replace(".264",".ts")
paac1=pin.replace(".264","_1.aac")
paac2=pin.replace(".264","_2.aac")
@@
-89,7
+95,10
@@
def raw2mkv(pin,pout,opt):#x264
else:
wineexe=configreader.getpath("wine")
pincap=pin.replace(".264",".srt")
else:
wineexe=configreader.getpath("wine")
pincap=pin.replace(".264",".srt")
- cap2ass=configreader.getpath("caption2ass")
+ try:
+ cap2ass=configreader.getpath("caption2ass")
+ except:
+ cap2ass=""
pints=pin.replace(".264",".ts")
pinaac=pin.replace(".264",".aac")
e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""
pints=pin.replace(".264",".ts")
pinaac=pin.replace(".264",".aac")
e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""