diff options
| author | Jonathan Tellier <jonathan.tellier@gmail.com> | 2009-06-11 03:36:01 +0800 |
|---|---|---|
| committer | jtellier <jonathan.tellier@collabora.co.uk> | 2009-06-12 20:59:10 +0800 |
| commit | c65de38d223ada5dfcf2d74b25a6af520143f3c5 (patch) | |
| tree | 945125c906c6daf1d1523679fba5743aa100059e /libempathy/empathy-tp-call.c | |
| parent | c5c09d7a6a0161b66f1747e3496cb1365f6f35bc (diff) | |
| download | gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.tar gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.tar.gz gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.tar.bz2 gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.tar.lz gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.tar.xz gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.tar.zst gsoc2013-empathy-c65de38d223ada5dfcf2d74b25a6af520143f3c5.zip | |
Better implemented empathy_tp_call_is_receiving_video and empathy_tp_call_is_sending_video.
Removed the "video-stream-changed" from EmpathyCallHandler
Corrected gtk-doc in EmpathyCallHandler.
empathy_call_window_stup_video_preview now checks the status of the
video_tee and the video_preview.
empathy_call_window_sink_added_cb does not automatically starts the
preview.
Diffstat (limited to 'libempathy/empathy-tp-call.c')
| -rw-r--r-- | libempathy/empathy-tp-call.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index bf3fe778c..a672d8a84 100644 --- a/libempathy/empathy-tp-call.c +++ b/libempathy/empathy-tp-call.c @@ -687,8 +687,7 @@ empathy_tp_call_is_receiving_video (EmpathyTpCall *call) g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE); - return priv->video->direction == TP_MEDIA_STREAM_DIRECTION_RECEIVE || - priv->video->direction == TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL; + return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE; } /** @@ -706,6 +705,5 @@ empathy_tp_call_is_sending_video (EmpathyTpCall *call) g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE); - return priv->video->direction == TP_MEDIA_STREAM_DIRECTION_SEND || - priv->video->direction == TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL; + return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_SEND; } |