← Back to branch summary

~photostory/photostory/cleanup

« back to all changes in this revision

Viewing changes to photostory

  • Committer: David Turner
  • Date: 2010-11-10 23:02:53 UTC
  • Revision ID: finalfantasykid13@gmail.com-20101110230253-0sv5vgifcsrrt8lf
-Fixed the FPS Video Creation Process
-Fixed a GTK Warning message

Show diffs side-by-side

added added

removed removed

Lines of Context:
photostory
84
84
 
85
85
                filmPipe = gst.Pipeline("filmPipe")
86
86
                filmSrc = gst.element_factory_make("multifilesrc", "filmSrc")
87
 
                filmSrc.set_property("location", os.path.expanduser("~/.photostory/photos/%d.png"))
 
87
                filmSrc.set_property("location", os.path.expanduser("~/.photostory/photos/") + "%d.png")
88
88
                filmFilt1 = gst.element_factory_make("capsfilter", "filmFilt1")
89
 
                filmCap1 = gst.Caps("image/png,framerate=" + str(self.adj.get_value()) + "/1,pixel-aspect-ratio=1/1")
 
89
                filmCap1 = gst.Caps("image/png,framerate=" + str(int(self.adj.get_value())) + "/1,pixel-aspect-ratio=1/1")
90
90
                filmFilt1.set_property("caps", filmCap1)
91
91
                filmPngDec = gst.element_factory_make("pngdec", "filmPngDec")
92
92
                filmff = gst.element_factory_make("ffmpegcolorspace", "filmff")
248
248
 
249
249
        self.win.add(hbox)
250
250
        hbox.pack_start(vbox1, expand=False)
251
 
        hbox.pack_start(vbox2)
252
251
        hbox2.pack_start(filmBut, expand=False)
253
252
        hbox2.pack_start(deleteBut, expand=False)
254
253
        #hbox2.pack_start(shareBut)
255
254
        hbox2.pack_start(aboutBut)
256
 
        hbox.pack_start(vbox2)
257
255
        vbox2.pack_start(movie)
258
256
        vbox2.pack_start(cal, expand=False, padding=25)
259
257
        vbox2.pack_start(takeBut, expand=False)
 
258
        hbox.pack_start(vbox2)
260
259
 
261
260
        self.win.show_all()
262
261