--- a/trunk/tubetutor/tubetutor.py +++ b/trunk/tubetutor/tubetutor.py @@ -119,7 +119,7 @@ self.files = [] for root, dirs, files in os.walk(os.path.join(self.path, "working")): for file in files: - if file.endswith(".mkv") or file.endswith(".txt"): + if file.endswith(".mkv") or file.endswith(".mp4") or file.endswith(".txt"): self.files.append(os.path.join(root, file)) self.files.sort() @@ -184,7 +184,7 @@ for file in self.files: if os.path.basename(file).startswith("tmp_"): continue - if file.endswith(".mkv"): + if file.endswith(".mkv") or file.endswith(".mp4"): self.start_frame() moviefile=file self.add_label(id(file) + "_image", image=os.path.join("media", "movie.png"), side=tkinter.LEFT) @@ -303,10 +303,10 @@ continue if file.endswith(".txt"): description += "- %s" % r.add_text(file) - if file.endswith(".mkv"): + if file.endswith(".mkv") or file.endswith(".mp4"): r.add_video(file) - r.concat(os.path.join(path, "tmp", "concat.mkv")) - r.speedup(os.path.join(path, "tmp", "speedup.mkv"), 0.7) + r.concat(os.path.join(path, "tmp", "concat.mkv"), audio=True) + #r.speedup(os.path.join(path, "tmp", "speedup.mkv"), 0.7) r.mux(os.path.join(path, "tmp", "main.mkv"), os.path.join("media", "back.mp3")) videos.append(r.lastfilename)