Merge lp:~photostory/photostory/cleanup into lp:photostory

[Josh Brown]

[lp:~photostory/photostory/cleanup]

26. By Josh Brown on 2010-11-07

Correct video creating path

27. By David Turner on 2010-11-10

-Fixed the FPS Video Creation Process
-Fixed a GTK Warning message

28. By David Turner on 2011-01-23

-Fixed bug #672272: The program now starts if the logo is missing

29. By David Turner on 2011-01-24

-Fixed the program crashing on startup

[Joel Auterson (joel-auterson)]

Check this out for the latest version, will you Josh? I never got around to approving it so it's probably out of date. Apologies.

review: Needs Resubmitting

[lp:~photostory/photostory/cleanup]

30. By Josh Brown on 2011-02-08

General cleanup; remove Main() function and other changes

[Josh Brown (joshbrown)]

I've manually cleaned the newest version of <code> and overwrote this branch with the amended <code> branch. This is ready for merging into <code> again, although testing beforehand may be prudent.

[Joel Auterson (joel-auterson)]

Could you do it AGAIN after I've got rid of the pickling? I have an
idea as to how we're going to do this.

[Josh Brown (joshbrown)]

If you've already started work on the pickling then I'll redo the cleanup afterwards.

[Josh Brown (joshbrown)]

I'm going to reject this as much of it has been incorporated into <lp:~photostory/photostory/code>, revision 34. Another proposal can be made at a later date if further changes are necessary, please feel free to reopen if you disagree.

review: Disapprove

[Joel Auterson (joel-auterson)]

It's your code, Josh, do whatever you feel necessary. :)

Unmerged revisions

30. By Josh Brown on 2011-02-08

General cleanup; remove Main() function and other changes

=== modified file 'photostory'
--- photostory	2011-01-24 04:12:08 +0000
+++ photostory	2011-02-08 23:10:47 +0000
@@ -1,283 +1,261 @@
 #!/usr/bin/python
 
-#Photostory 0.9
-#by Joel Auterson ([e-mail])
-#http://www.launchpad.net/photostory
+# Photostory 0.95
+# Joel Auterson ([e-mail])
+# http://launchpad.net/photostory
 
-import pygst
-pygst.require("0.10")
-import gst
-import pygtk
-import gtk
-from time import strftime
-import time
-import os.path
-import os
-import cPickle
+import time, os, cPickle, gtk, gst, glib
 from threading import Timer
-import glib
-
-class Main:
-
-    def __init__(self):
-
-        pipeline = None
-        xvimagesink = None
-        movie = None
-        self.movPath = None
-        self.adj = gtk.Adjustment(5, 1, 10, 1)
-        self.pic=None
-
-        # If the `~/.photostory/photos` directory doesn't exist, create it:
-        if not os.path.exists(os.path.expanduser('~/.photostory/photos')):
-            os.makedirs(os.path.expanduser('~/.photostory/photos'))
-
-        # If the `~/.photostory/db` pickle doesn't exist, create it:
-        if not os.path.isfile(os.path.expanduser('~/.photostory/db')):
-            cPickle.dump({}, open(os.path.expanduser('~/.photostory/db'), 'w'))
-
-        # If the `~/.photostory/num` pickle doesn't exist, create it:
-        if not os.path.isfile(os.path.expanduser('~/.photostory/num')):
-            cPickle.dump(0, open(os.path.expanduser('~/.photostory/num'), 'w'))
-
-        # Load the `db` and `num` pickles:
-        self.db = cPickle.load(open(os.path.expanduser('~/.photostory/db'), 'rb'))
-        self.ind = int(cPickle.load(open(os.path.expanduser('~/.photostory/num'), 'rb')))
-
-        todayPicName = os.path.expanduser('~/.photostory/photos/') + str(self.ind) + ".png"
-        todayDate = None
-
-        def chooseDay(cal):
-            dateTuple = cal.get_date()
-            setPic(dateTuple)
-
-        def closedown(win):
-            print 'ind ' + str(self.ind)
-            print 'db' + str(self.db)
-            cPickle.dump(self.db, open(os.path.expanduser('~/.photostory/db'), 'wb'))
-            cPickle.dump(self.ind, open(os.path.expanduser('~/.photostory/num'), 'wb'))
-            gtk.main_quit()
-
-        def about(aboutBut):
-            dAbout = gtk.AboutDialog()
-            dAbout.set_name("Photostory")
-            dAbout.set_comments("Photostory is an application that lets you tell the story of your life in photos, by taking a snapshot of you each day. You can then make these into a video to share with friends or on the internet.")
-            dAbout.set_artists(("Josh Brown", ""))
-            dAbout.set_authors(("Joel Auterson", "David Turner", "Josh Brown"))
-            dAbout.set_website("http://launchpad.net/photostory")
-            response = dAbout.run()
-            if response == -6:
-                dAbout.destroy()
-
-        def movify(filmBut):
-
-            def movPick(movFileButton):
-                movPicker = gtk.FileChooserDialog(title="Choose a save location", parent=movDia, action=gtk.FILE_CHOOSER_ACTION_SAVE, buttons=(("Save Here", -6)), backend=None)
-                movRes = movPicker.run()
-                if movRes == -6:
-                    self.movPath = movPicker.get_filename()
-                    movPicker.destroy()
-
-            def movGen(movButton):
-
-                movDia.destroy()
-
-                filmPipe = gst.Pipeline("filmPipe")
-                filmSrc = gst.element_factory_make("multifilesrc", "filmSrc")
-                filmSrc.set_property("location", os.path.expanduser("~/.photostory/photos/") + "%d.png")
-                filmFilt1 = gst.element_factory_make("capsfilter", "filmFilt1")
-                filmCap1 = gst.Caps("image/png,framerate=" + str(int(self.adj.get_value())) + "/1,pixel-aspect-ratio=1/1")
-                filmFilt1.set_property("caps", filmCap1)
-                filmPngDec = gst.element_factory_make("pngdec", "filmPngDec")
-                filmff = gst.element_factory_make("ffmpegcolorspace", "filmff")
-                filmFilt2 = gst.element_factory_make("capsfilter", "filmFilt2")
-                filmCap2 = gst.Caps("video/x-raw-yuv")
-                filmFilt2.set_property("caps", filmCap2)
-                filmTheora = gst.element_factory_make("xvidenc", "filmTheora")
-                filmOggmux = gst.element_factory_make("ffmux_mp4", "filmOggmux")
-                filmFilesink = gst.element_factory_make("filesink", "filmFilesink")
-                filmFilesink.set_property("location", self.movPath)
-
-                filmPipe.add(filmSrc, filmFilt1, filmPngDec, filmff, filmFilt2, filmTheora, filmOggmux, filmFilesink)
-                gst.element_link_many(filmSrc, filmFilt1, filmPngDec, filmff, filmFilt2, filmTheora, filmOggmux, filmFilesink)
-                filmPipe.set_state(gst.STATE_PLAYING)
-                time.sleep(5)
-                filmBut.set_sensitive(True)
-
-            movDia = gtk.Window(gtk.WINDOW_TOPLEVEL)
-            movDia.set_title("Create Film")
-            movDia.set_resizable(False)
-            filmBut.set_sensitive(False)
-            movVbox = gtk.VBox(homogeneous=False, spacing=2)
-            movLabel = gtk.Label("Here you can create a video made up of all your photos. \n\nJust choose a save location and hit 'create'.\n\nRemember, the path must end in '.mp4'.\n")
-            movFileButton = gtk.Button(label="Choose a location")
-            movButton = gtk.Button(label="Create")
-
-            #FPS Slider
-            movSliderBox = gtk.HBox(homogeneous=False, spacing=3)
-            movSliderLabel = gtk.Label("FPS:")
-            movSlider = gtk.HScale(self.adj)
-            movSlider.set_digits(0)
-            movSliderBox.pack_start(movSliderLabel, expand=False)
-            movSliderBox.pack_start(movSlider, expand=True)
-
-            movDia.add(movVbox)
-            movVbox.pack_start(movLabel, expand=False)
-            movVbox.pack_start(movSliderBox, expand=False)
-            movVbox.pack_start(movFileButton, expand=False)
-            movVbox.pack_start(movButton, expand=False)
-            movButton.connect("clicked", movGen)
-            movFileButton.connect("clicked", movPick)
-            movDia.show_all()
-
-        def capture(takeBut):
-
-            def takePic():
-                pipeline.set_state(gst.STATE_NULL)
-                stillPipe = gst.Pipeline("stillPipe")
-                stillCam = gst.element_factory_make("v4l2src", "stillPipe")
-                stillFilt = gst.element_factory_make("capsfilter", "stillFilt")
-                stillCap = gst.Caps("video/x-raw-yuv,width=640,height=480")
-                stillFilt.set_property("caps", stillCap)
-                ffmpegcolorspace = gst.element_factory_make("ffmpegcolorspace", "ffmpegcolorspace")
-                pngEnc = gst.element_factory_make("pngenc", "pngenc")
-                filesink = gst.element_factory_make("filesink", "filesink")
-                filesink.set_property("location", todayPicName)
-                self.db[todayDate] = todayPicName
-                cal.freeze()
-                cal.select_month(todayDate[1], todayDate[0])
-                cal.select_day(todayDate[2])
-                cal.thaw()
-                stillPipe.add(stillCam, stillFilt, ffmpegcolorspace, pngEnc, filesink)
-                gst.element_link_many(stillCam, stillFilt, ffmpegcolorspace, pngEnc, filesink)
-                stillPipe.set_state(gst.STATE_PLAYING)
-                time.sleep(1)
-                stillPipe.set_state(gst.STATE_NULL)
-                xvimagesink.set_xwindow_id(movie.window.xid)
-                pipeline.set_state(gst.STATE_PLAYING)
-                setPic(todayDate)
-                self.ind += 1
-
-            def countdown(n = 3):
-                self.pic.set_markup("<span size='54000'>" + str(n) + "</span>")
-                if n == 0: takePic()
-                else: glib.timeout_add(1000, countdown, n-1)
-
-            countdown()
-
-        def deletePic(deleteBut):
-            def getKey(dic, val):
-                return [k for k, v in dic.iteritems() if v == val][0]
-            date = cal.get_date()
-            if date in self.db:
-                os.remove(self.db[date])
-                setPic("")
-                if date == todayDate:
-                    takeBut.set_label("Take today's photo")
-                    takeBut.set_sensitive(True)
-                gaps = 0
-                i = 0
-                for element in self.db:
-                    oldPath = os.path.expanduser('~/.photostory/photos/') + str(i) + ".png"
-                    if not os.path.exists(oldPath):
-                        gaps += 1
-                        i += 1
-                    oldPath = os.path.expanduser('~/.photostory/photos/') + str(i) + ".png"
-                    if os.path.exists(oldPath):
-                        key = getKey(self.db, oldPath)
-                        newPath = os.path.expanduser('~/.photostory/photos/') + str(i-gaps) + ".png"
-                        os.rename(oldPath, newPath)
-                        self.db[key] = newPath
-                    i += 1
-                del self.db[date]
-                self.ind -= 1
-
-        def setPic(date):
-            if self.pic != None:
-                vbox1.remove(self.pic)
-                vbox1.remove(hbox2)
-            if date in self.db:
-                self.pic = gtk.Image()
-                self.pic.set_from_file(self.db[date])
-                takeBut.set_label("Photo taken for this day.")
-                takeBut.set_sensitive(False)
-            else: 
-                if date == todayDate:
-                    takeBut.set_label("Take today's photo")
-                    takeBut.set_sensitive(True)
-                else:
-                    takeBut.set_label("Take today's photo")
-                    takeBut.set_sensitive(False)
-                self.pic = gtk.Label()
-                self.pic.set_justify(gtk.JUSTIFY_CENTER)
-                self.pic.set_markup("<span size='54000'>No Photo\nToday</span>");
-                self.pic.set_size_request(640, 480)
-            vbox1.pack_start(self.pic)
-            vbox1.pack_start(hbox2)
-            vbox1.show_all()
-
-        #Interface
-        self.win = gtk.Window(gtk.WINDOW_TOPLEVEL)
-        self.win.connect("destroy", closedown)
-        self.win.set_default_size(900, 600)
-        self.win.set_resizable(False)
-        self.win.set_title("Photostory")
-        if os.path.exists("photostory.svg"):
-            self.win.set_icon_from_file("photostory.svg")
-        movie = gtk.DrawingArea()
-        movie.set_size_request(320, 240)
-        hbox = gtk.HBox(homogeneous=False, spacing=3)
-        vbox1 = gtk.VBox(homogeneous=False)
-        vbox2 = gtk.VBox(homogeneous = False)   
-        filmBut = gtk.Button(label="Create Film")
-        filmBut.connect("clicked", movify)
-        deleteBut = gtk.Button(label="Delete Photo")
-        deleteBut.connect("clicked", deletePic)
-        shareBut = gtk.Button(label="Share Video")
-        hbox2 = gtk.HBox(homogeneous=True)
-        aboutBut = gtk.Button(label="About")
-        aboutBut.connect("clicked", about)
-
-        cal = gtk.Calendar()
-        todayDate = cal.get_date()
-        cal.connect("day-selected", chooseDay)
-
-        takeBut = gtk.Button(label="Take today's photo")
-        takeBut.connect("clicked", capture)
-
-        setPic(todayDate)
-
-        self.win.add(hbox)
-        hbox.pack_start(vbox1, expand=False)
-        hbox2.pack_start(filmBut, expand=False)
-        hbox2.pack_start(deleteBut, expand=False)
-        #hbox2.pack_start(shareBut)
-        hbox2.pack_start(aboutBut)
-        vbox2.pack_start(movie)
-        vbox2.pack_start(cal, expand=False, padding=25)
-        vbox2.pack_start(takeBut, expand=False)
-        hbox.pack_start(vbox2)
-
-        self.win.show_all()
-
-        #Pipeline stuff - feed
-        pipeline = gst.Pipeline("mypipeline")
-
-        camera = gst.element_factory_make("v4l2src", "camera")
-        camera.set_property("device", "/dev/video0")
-
-        caps = gst.Caps("video/x-raw-yuv,width=640,height=480,framerate=30/1")
-        filt = gst.element_factory_make("capsfilter", "filter")
-        filt.set_property("caps", caps)
-
-        xvimagesink = gst.element_factory_make("xvimagesink", "sink")
-
-        pipeline.add(camera, filt, xvimagesink)
-        gst.element_link_many(camera, filt, xvimagesink)
-
+
+pipeline = None
+xvimagesink = None
+movie = None
+movPath = None
+adj = gtk.Adjustment(5, 1, 10, 1)
+pic = None
+
+# If the `~/.photostory/photos` directory doesn't exist, create it:
+if not os.path.exists(os.path.expanduser('~/.photostory/photos')):
+    os.makedirs(os.path.expanduser('~/.photostory/photos'))
+
+# If the `~/.photostory/db` pickle doesn't exist, create it:
+if not os.path.isfile(os.path.expanduser('~/.photostory/db')):
+    cPickle.dump({}, open(os.path.expanduser('~/.photostory/db'), 'w'))
+
+# If the `~/.photostory/num` pickle doesn't exist, create it:
+if not os.path.isfile(os.path.expanduser('~/.photostory/num')):
+    cPickle.dump(0, open(os.path.expanduser('~/.photostory/num'), 'w'))
+
+# Load the `db` and `num` pickles:
+db = cPickle.load(open(os.path.expanduser('~/.photostory/db'), 'rb'))
+ind = int(cPickle.load(open(os.path.expanduser('~/.photostory/num'), 'rb')))
+
+todayPicName = os.path.expanduser('~/.photostory/photos/') + str(self.ind) + ".png"
+todayDate = None
+
+def chooseDay(cal):
+    dateTuple = cal.get_date()
+    setPic(dateTuple)
+
+def closedown(win):
+    print 'ind ' + str(ind)
+    print 'db' + str(db)
+    cPickle.dump(db, open(os.path.expanduser('~/.photostory/db'), 'wb'))
+    cPickle.dump(ind, open(os.path.expanduser('~/.photostory/num'), 'wb'))
+    gtk.main_quit()
+
+def about(aboutBut):
+    dAbout = gtk.AboutDialog()
+    dAbout.set_name("Photostory")
+    dAbout.set_comments("Photostory is an application that lets you tell the story of your life in photos, by taking a snapshot of you each day. You can then make these into a video to share with friends or on the internet.")
+    dAbout.set_artists(("Josh Brown"))
+    dAbout.set_authors(("Joel Auterson", "David Turner", "Josh Brown"))
+    dAbout.set_website("http://launchpad.net/photostory")
+    response = dAbout.run()
+    if response == -6:
+        dAbout.destroy()
+
+def movify(filmBut):
+    def movPick(movFileButton):
+        movPicker = gtk.FileChooserDialog(title="Choose a save location", parent=movDia, action=gtk.FILE_CHOOSER_ACTION_SAVE, buttons=(("Save Here", -6)), backend=None)
+        movRes = movPicker.run()
+        if movRes == -6:
+            movPath = movPicker.get_filename()
+            movPicker.destroy()
+
+    def movGen(movButton):
+        movDia.destroy()
+
+        filmPipe = gst.Pipeline("filmPipe")
+        filmSrc = gst.element_factory_make("multifilesrc", "filmSrc")
+        filmSrc.set_property("location", os.path.expanduser("~/.photostory/photos/") + "%d.png")
+        filmFilt1 = gst.element_factory_make("capsfilter", "filmFilt1")
+        filmCap1 = gst.Caps("image/png,framerate=" + str(int(self.adj.get_value())) + "/1,pixel-aspect-ratio=1/1")
+        filmFilt1.set_property("caps", filmCap1)
+        filmPngDec = gst.element_factory_make("pngdec", "filmPngDec")
+        filmff = gst.element_factory_make("ffmpegcolorspace", "filmff")
+        filmFilt2 = gst.element_factory_make("capsfilter", "filmFilt2")
+        filmCap2 = gst.Caps("video/x-raw-yuv")
+        filmFilt2.set_property("caps", filmCap2)
+        filmTheora = gst.element_factory_make("xvidenc", "filmTheora")
+        filmOggmux = gst.element_factory_make("ffmux_mp4", "filmOggmux")
+        filmFilesink = gst.element_factory_make("filesink", "filmFilesink")
+        filmFilesink.set_property("location", movPath)
+
+        filmPipe.add(filmSrc, filmFilt1, filmPngDec, filmff, filmFilt2, filmTheora, filmOggmux, filmFilesink)
+        gst.element_link_many(filmSrc, filmFilt1, filmPngDec, filmff, filmFilt2, filmTheora, filmOggmux, filmFilesink)
+        filmPipe.set_state(gst.STATE_PLAYING)
+        time.sleep(5)
+        filmBut.set_sensitive(True)
+
+    movDia = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    movDia.set_title("Create Film")
+    movDia.set_resizable(False)
+    filmBut.set_sensitive(False)
+    movVbox = gtk.VBox(homogeneous=False, spacing=2)
+    movLabel = gtk.Label("Here you can create a video made up of all your photos. \n\nJust choose a save location and hit 'create'.\n\nRemember, the path must end in '.mp4'.\n")
+    movFileButton = gtk.Button(label="Choose a location")
+    movButton = gtk.Button(label="Create")
+
+    #FPS Slider
+    movSliderBox = gtk.HBox(homogeneous=False, spacing=3)
+    movSliderLabel = gtk.Label("FPS:")
+    movSlider = gtk.HScale(adj)
+    movSlider.set_digits(0)
+    movSliderBox.pack_start(movSliderLabel, expand=False)
+    movSliderBox.pack_start(movSlider, expand=True)
+
+    movDia.add(movVbox)
+    movVbox.pack_start(movLabel, expand=False)
+    movVbox.pack_start(movSliderBox, expand=False)
+    movVbox.pack_start(movFileButton, expand=False)
+    movVbox.pack_start(movButton, expand=False)
+    movButton.connect("clicked", movGen)
+    movFileButton.connect("clicked", movPick)
+    movDia.show_all()
+
+def capture(takeBut):
+    def takePic():
+        pipeline.set_state(gst.STATE_NULL)
+        stillPipe = gst.Pipeline("stillPipe")
+        stillCam = gst.element_factory_make("v4l2src", "stillPipe")
+        stillFilt = gst.element_factory_make("capsfilter", "stillFilt")
+        stillCap = gst.Caps("video/x-raw-yuv,width=640,height=480")
+        stillFilt.set_property("caps", stillCap)
+        ffmpegcolorspace = gst.element_factory_make("ffmpegcolorspace", "ffmpegcolorspace")
+        pngEnc = gst.element_factory_make("pngenc", "pngenc")
+        filesink = gst.element_factory_make("filesink", "filesink")
+        filesink.set_property("location", todayPicName)
+        db[todayDate] = todayPicName
+        cal.freeze()
+        cal.select_month(todayDate[1], todayDate[0])
+        cal.select_day(todayDate[2])
+        cal.thaw()
+        stillPipe.add(stillCam, stillFilt, ffmpegcolorspace, pngEnc, filesink)
+        gst.element_link_many(stillCam, stillFilt, ffmpegcolorspace, pngEnc, filesink)
+        stillPipe.set_state(gst.STATE_PLAYING)
+        time.sleep(1)
+        stillPipe.set_state(gst.STATE_NULL)
         xvimagesink.set_xwindow_id(movie.window.xid)
-
         pipeline.set_state(gst.STATE_PLAYING)
-
-start=Main()
+        setPic(todayDate)
+        ind += 1
+
+    def countdown(n = 3):
+        self.pic.set_markup("<span size='54000'>" + str(n) + "</span>")
+        if n == 0: takePic()
+        else: glib.timeout_add(1000, countdown, n-1)
+
+    countdown()
+
+def deletePic(deleteBut):
+    def getKey(dic, val):
+        return [k for k, v in dic.iteritems() if v == val][0]
+    date = cal.get_date()
+    if date in db:
+        os.remove(db[date])
+        setPic("")
+        if date == todayDate:
+            takeBut.set_label("Take today's photo")
+            takeBut.set_sensitive(True)
+        gaps = 0
+        i = 0
+        for element in db:
+            oldPath = os.path.expanduser('~/.photostory/photos/') + str(i) + ".png"
+            if not os.path.exists(oldPath):
+                gaps += 1
+                i += 1
+            oldPath = os.path.expanduser('~/.photostory/photos/') + str(i) + ".png"
+            if os.path.exists(oldPath):
+                key = getKey(db, oldPath)
+                newPath = os.path.expanduser('~/.photostory/photos/') + str(i-gaps) + ".png"
+                os.rename(oldPath, newPath)
+                db[key] = newPath
+            i += 1
+        del db[date]
+        ind -= 1
+
+def setPic(date):
+    global pic
+    if pic != None:
+        vbox1.remove(pic)
+        vbox1.remove(hbox2)
+    if date in db:
+        pic = gtk.Image()
+        pic.set_from_file(db[date])
+        takeBut.set_label("Photo taken for this day.")
+        takeBut.set_sensitive(False)
+    else: 
+        if date == todayDate:
+            takeBut.set_label("Take today's photo")
+            takeBut.set_sensitive(True)
+        else:
+            takeBut.set_label("Take today's photo")
+            takeBut.set_sensitive(False)
+        pic = gtk.Label()
+        pic.set_justify(gtk.JUSTIFY_CENTER)
+        pic.set_markup("<span size='54000'>No Photo\nToday</span>");
+        pic.set_size_request(640, 480)
+    vbox1.pack_start(pic)
+    vbox1.pack_start(hbox2)
+    vbox1.show_all()
+
+#Interface
+self.win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+self.win.connect("destroy", closedown)
+self.win.set_default_size(900, 600)
+self.win.set_resizable(False)
+self.win.set_title("Photostory")
+if os.path.exists("photostory.svg"):
+    self.win.set_icon_from_file("photostory.svg")
+movie = gtk.DrawingArea()
+movie.set_size_request(320, 240)
+hbox = gtk.HBox(homogeneous=False, spacing=3)
+vbox1 = gtk.VBox(homogeneous=False)
+vbox2 = gtk.VBox(homogeneous = False)   
+filmBut = gtk.Button(label="Create Film")
+filmBut.connect("clicked", movify)
+deleteBut = gtk.Button(label="Delete Photo")
+deleteBut.connect("clicked", deletePic)
+shareBut = gtk.Button(label="Share Video")
+hbox2 = gtk.HBox(homogeneous=True)
+aboutBut = gtk.Button(label="About")
+aboutBut.connect("clicked", about)
+
+cal = gtk.Calendar()
+todayDate = cal.get_date()
+cal.connect("day-selected", chooseDay)
+
+takeBut = gtk.Button(label="Take today's photo")
+takeBut.connect("clicked", capture)
+
+setPic(todayDate)
+
+self.win.add(hbox)
+hbox.pack_start(vbox1, expand=False)
+hbox2.pack_start(filmBut, expand=False)
+hbox2.pack_start(deleteBut, expand=False)
+#hbox2.pack_start(shareBut)
+hbox2.pack_start(aboutBut)
+vbox2.pack_start(movie)
+vbox2.pack_start(cal, expand=False, padding=25)
+vbox2.pack_start(takeBut, expand=False)
+hbox.pack_start(vbox2)
+
+self.win.show_all()
+
+#Pipeline stuff - feed
+pipeline = gst.Pipeline("mypipeline")
+camera = gst.element_factory_make("v4l2src", "camera")
+camera.set_property("device", "/dev/video0")
+caps = gst.Caps("video/x-raw-yuv,width=640,height=480,framerate=30/1")
+filt = gst.element_factory_make("capsfilter", "filter")
+filt.set_property("caps", caps)
+xvimagesink = gst.element_factory_make("xvimagesink", "sink")
+pipeline.add(camera, filt, xvimagesink)
+gst.element_link_many(camera, filt, xvimagesink)
+xvimagesink.set_xwindow_id(movie.window.xid)
+pipeline.set_state(gst.STATE_PLAYING)
+
+# Start GTK
 gtk.main()