--- a/trunk/tubetutor/ffmpeg.py +++ b/trunk/tubetutor/ffmpeg.py @@ -27,7 +27,7 @@ # The following helper functions will retrieve the pathnames for the ffmpeg tools # def get_cmd_ffmpeg(): - subdir=os.path.join(os.path.dirname(sys.argv[0]), "ffmpeg -loglevel verbose") + subdir=os.path.join(os.path.dirname(sys.argv[0]), "ffmpeg") if os.path.exists(subdir): return os.path.join(subdir, "ffmpeg.exe -loglevel verbose") return "ffmpeg -loglevel verbose" @@ -90,9 +90,15 @@ if proc_ffmpeg: try: ctypes.windll.kernel32.TerminateProcess(int(proc_ffmpeg._handle), -1) - except: + finally: + pass + proc_ffmpeg.kill() + if hasattr(os, "killpg"): os.killpg(os.getpgid(proc_ffmpeg.pid), signal.SIGTERM) - proc_ffmpeg.kill() + os.killpg(os.getpgid(proc_ffmpeg.pid), signal.SIGKILL) + if hasattr(os, "kill"): + os.kill(proc_ffmpeg.pid, signal.CTRL_C_EVENT) + proc_ffmpeg=None def video_duration(filename): @@ -138,7 +144,7 @@ def add_text(self, filename, duration=5): f = open(filename, "r") if f: - content = f.read() + content = f.read().replace("\n", "") f.close() if content.replace("\n", "") == "": return