diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-07-22 19:08:39 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-07-25 19:47:24 +0800 |
| commit | c4906c89433cdd5dff9f500579c580799fe77dca (patch) | |
| tree | 9f302b8f39483112066941224a512b0c73c95adc /src | |
| parent | 5a591d49c2ce331c79247fa868a856fa2494196d (diff) | |
| download | gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.tar gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.tar.gz gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.tar.bz2 gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.tar.lz gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.tar.xz gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.tar.zst gsoc2013-empathy-c4906c89433cdd5dff9f500579c580799fe77dca.zip | |
CallWindow: ignore events in the data probe callback
We only want to show the remote video again if we receive
video frames, not if we receive an event for whatever reason.
That's in fact what we get when we start sending our own video,
and so we don't want to display the remote video if it was
hidden because we're not receiving it anymore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-window.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 69ceb17cc..7ad0eb1e1 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -2408,6 +2408,10 @@ empathy_call_window_video_probe_cb (GstPad *pad, GstMiniObject *mini_obj, EmpathyCallWindow *self) { + /* Ignore events */ + if (GST_IS_EVENT (mini_obj)) + return TRUE; + if (G_UNLIKELY (!self->priv->got_video)) { /* show the remote video */ |