Diff of /trunk/tubetutor/tubetutor.py [r3] .. [r4]  Maximize  Restore

Switch to unified view

a/trunk/tubetutor/tubetutor.py b/trunk/tubetutor/tubetutor.py
...
...
251
    def render(self):
251
    def render(self):
252
        global resolution
252
        global resolution
253
        self.refresh_files()
253
        self.refresh_files()
254
        videos=[]
254
        videos=[]
255
        description=""
255
        description=""
256
        
256
257
        if os.path.exists(os.path.join("media", "intro.mkv")):
257
        # intro
258
            # intro
258
        r = ffmpeg.renderer()
259
            r = ffmpeg.renderer()
259
        r.resolution(resolution)
260
            r.resolution(resolution)
260
        r.filename(os.path.join("media", "intro.mkv"))
261
            r.filename(os.path.join("media", "intro.mkv"))
261
        params = " -scale %s!" % resolution.replace(":", "x")
262
            params = " -scale %s!" % resolution.replace(":", "x")
262
        params += " -font %s -weight 500 -pointsize 100" % ffmpeg.font
263
            params += " -font %s -weight 500 -pointsize 100" % ffmpeg.font
263
        params += " -draw \"gravity northwest fill white text 100,775 '%s'\"" % self.get_title()
264
            params += " -draw \"gravity northwest fill white text 100,775 '%s'\"" % self.get_title()
264
        params += " -scale %s!" % resolution.replace(":", "x")
265
            params += " -scale %s!" % resolution.replace(":", "x")
265
        ffmpeg.convert_image(os.path.join("media", "intro.jpg"), os.path.join(path, "tmp", "intro.jpg"), params)
266
            ffmpeg.convert_image(os.path.join("media", "intro.jpg"), os.path.join(path, "tmp", "intro.jpg"), params)
266
        r.add_image(os.path.join(path, "tmp", "intro.jpg"), fadein=False)
267
            r.add_image(os.path.join(path, "tmp", "intro.jpg"), fadein=False)
267
        r.process(os.path.join(path, "tmp", "intro-scale.mkv"), "-vf scale=" + resolution)
268
            r.process(os.path.join(path, "tmp", "intro-scale.mkv"), "-vf scale=" + resolution)
268
        r.concat(os.path.join(path, "tmp", "intro-concat.mkv"))
269
            r.concat(os.path.join(path, "tmp", "intro-concat.mkv"))
269
270
270
        # mux intro
271
            # mux intro
271
        r = ffmpeg.renderer()
272
            r = ffmpeg.renderer()
272
        r.resolution(resolution)
273
            r.resolution(resolution)
273
        r.filename(os.path.join(path, "tmp", "intro-concat.mkv"))
274
            r.filename(os.path.join(path, "tmp", "intro-concat.mkv"))
274
        r.mux(os.path.join(path, "tmp", "intro.mkv"), os.path.join("media", "intro.mp3"))
275
            r.mux(os.path.join(path, "tmp", "intro.mkv"), os.path.join("media", "intro.mp3"))
275
        videos.append(r.lastfilename)
276
            videos.append(r.lastfilename)
277
            r = ffmpeg.renderer()
278
            r.resolution(resolution)
279
        else:
280
            r = ffmpeg.renderer()
281
            r.resolution(resolution)
282
            r.add_image(os.path.join("media", "intro.png"))
276
283
277
        # main
284
        # main
278
        r = ffmpeg.renderer()
285
        #r = ffmpeg.renderer()
279
        r.resolution(resolution)
286
        #r.resolution(resolution)
280
        for file in self.files:
287
        for file in self.files:
281
            if os.path.basename(file).startswith("tmp_"):
288
            if os.path.basename(file).startswith("tmp_"):
282
                continue
289
                continue
283
            if file.endswith(".txt"):
290
            if file.endswith(".txt"):
284
                description += "- %s" % r.add_text(file)
291
                description += "- %s" % r.add_text(file)