projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6a5f8a1
)
Revert "bus: Check if pending messages are in the queue"
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Wed, 6 Apr 2011 11:56:46 +0000
(13:56 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Wed, 6 Apr 2011 12:12:26 +0000
(14:12 +0200)
This reverts commit
bd1c40011434c1efaa696dc98ef855ef9cce9b28
.
gst/gstbus.c
patch
|
blob
|
history
diff --git
a/gst/gstbus.c
b/gst/gstbus.c
index
7183fea
..
ff6e87d
100644
(file)
--- a/
gst/gstbus.c
+++ b/
gst/gstbus.c
@@
-694,10
+694,8
@@
typedef struct
static gboolean
gst_bus_source_prepare (GSource * source, gint * timeout)
{
- GstBusSource *bsrc = (GstBusSource *) source;
*timeout = -1;
-
- return gst_bus_have_pending (bsrc->bus);
+ return FALSE;
}
static gboolean
@@
-705,8
+703,7
@@
gst_bus_source_check (GSource * source)
{
GstBusSource *bsrc = (GstBusSource *) source;
- return gst_bus_have_pending (bsrc->bus) | (bsrc->bus->priv->
- pollfd.revents & (G_IO_IN | G_IO_HUP | G_IO_ERR));
+ return bsrc->bus->priv->pollfd.revents & (G_IO_IN | G_IO_HUP | G_IO_ERR);
}
static gboolean