Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-03-26 20:46:31 (GMT)
committer Daniel Drake <dsd@laptop.org>2012-03-26 20:46:31 (GMT)
commit467c35b94b1c76ec5af2c7d479f318480ee02a90 (patch)
tree47c3e7b409fbacc62e960637a431a21fa9193c87
parent1b7f3b225d8965a25e5b014f4ca4c4918c5893fa (diff)
Don't use pad blocking
This never worked right: we always managed to block, but the unblock never happened. Previously this didn't hurt anything, but on F17 it causes problems: since the pad is blocked, we never take the photo. Remove pad blocking to work around this. Seems to be working fine with live-pipeline modification.
-rw-r--r--glive.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/glive.py b/glive.py
index 97fc0e1..8618284 100644
--- a/glive.py
+++ b/glive.py
@@ -397,9 +397,6 @@ class Glive:
'name': self.model.get_nickname()}
return tl
- def blockedCb(self, x, y, z):
- pass
-
def _take_photo(self, photo_mode):
if self._pic_exposure_open:
return
@@ -407,11 +404,9 @@ class Glive:
self._photo_mode = photo_mode
self._pic_exposure_open = True
pad = self._photobin.get_static_pad("sink")
- pad.set_blocked_async(True, self.blockedCb, None)
self._pipeline.add(self._photobin)
self._photobin.set_state(gst.STATE_PLAYING)
self._pipeline.get_by_name("tee").link(self._photobin)
- pad.set_blocked_async(False, self.blockedCb, None)
def take_photo(self):
if self._has_camera:
@@ -422,10 +417,8 @@ class Glive:
return
pad = self._photobin.get_static_pad("sink")
- pad.set_blocked_async(True, self.blockedCb, None)
self._pipeline.get_by_name("tee").unlink(self._photobin)
self._pipeline.remove(self._photobin)
- pad.set_blocked_async(False, self.blockedCb, None)
self._pic_exposure_open = False
pic = gtk.gdk.pixbuf_loader_new_with_mime_type("image/jpeg")