diff -u luciole-0.7.3/debian/changelog luciole-0.7.3/debian/changelog --- luciole-0.7.3/debian/changelog +++ luciole-0.7.3/debian/changelog @@ -1,3 +1,11 @@ +luciole (0.7.3-0ubuntu1.1) karmic; urgency=low + + * lucioLib/luciole_gstreamer.py, lucioLib/luciole_gstreamer_play.py: added + correct handling of device acquisition lock in gtk (LP: #481732). Patch from + Nicolas Bertrand + + -- Fabrice Coutadeur Fri, 20 Nov 2009 07:40:37 +0100 + luciole (0.7.3-0ubuntu1) karmic; urgency=low * Integration to ubuntu repository (LP: #374249) only in patch2: unchanged: --- luciole-0.7.3.orig/lucioLib/luciole_gstreamer.py +++ luciole-0.7.3/lucioLib/luciole_gstreamer.py @@ -601,8 +601,14 @@ if message.structure is None: return if message.structure.get_name() == 'prepare-xwindow-id': + # Assign the viewport + # all this is needed to sync with the X server before giving the + # x id to the sink + gtk.gdk.threads_enter() + gtk.gdk.display_get_default().sync() self.videowidget.set_sink(message.src) message.src.set_property('force-aspect-ratio', True) + gtk.gdk.threads_leave() def on_message(self, bus, message): """ Gstreamer message callback""" only in patch2: unchanged: --- luciole-0.7.3.orig/lucioLib/luciole_gstreamer_play.py +++ luciole-0.7.3/lucioLib/luciole_gstreamer_play.py @@ -24,7 +24,7 @@ pygst.require('0.10') import gst import gst.interfaces - +import gtk class luciole_gstreamer_play(object) : """ implementation of image per image video playing with gstreamer . @@ -140,8 +140,15 @@ if message.structure is None: return if message.structure.get_name() == 'prepare-xwindow-id': - self._videowidget.set_sink(message.src) - message.src.set_property('force-aspect-ratio', True) + # Assign the viewport + # all this is needed to sync with the X server before giving the + # x id to the sink + gtk.gdk.threads_enter() + gtk.gdk.display_get_default().sync() + self._videowidget.set_sink(message.src) + message.src.set_property('force-aspect-ratio', True) + gtk.gdk.threads_leave() + def on_message(self, bus, message): """ call back on message sent by gstreamer """