aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-10 01:37:24 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-28 00:33:42 +0800
commitf4b6d60a4b454233cac3fb5b5e1c407e7496baa6 (patch)
tree24d320053360db468def16adaa0b34f33eb8d7ff
parentcac3a717a5e34df4439ec5a0660d5ffdc76a27c5 (diff)
downloadgsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.tar
gsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.tar.gz
gsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.tar.bz2
gsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.tar.lz
gsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.tar.xz
gsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.tar.zst
gsoc2013-empathy-f4b6d60a4b454233cac3fb5b5e1c407e7496baa6.zip
call-window: factor out display_video_preview to display/hide the video preview
-rw-r--r--src/empathy-call-window.c51
1 files changed, 37 insertions, 14 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 28030c012..012ff301a 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -44,6 +44,9 @@
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-sound.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include <libempathy/empathy-debug.h>
+
#include "empathy-call-window.h"
#include "empathy-call-window-fullscreen.h"
#include "empathy-sidebar.h"
@@ -669,6 +672,33 @@ empathy_call_window_setup_video_preview (EmpathyCallWindow *window)
}
static void
+display_video_preview (EmpathyCallWindow *self,
+ gboolean display)
+{
+ EmpathyCallWindowPriv *priv = GET_PRIV (self);
+
+ if (display)
+ {
+ /* Display the preview and hide the self avatar */
+ DEBUG ("Show video preview");
+
+ if (priv->video_preview == NULL)
+ empathy_call_window_setup_video_preview (self);
+ gtk_widget_show (priv->video_preview);
+ gtk_widget_hide (priv->self_user_avatar_widget);
+ }
+ else
+ {
+ /* Display the self avatar and hide the preview */
+ DEBUG ("Show self avatar");
+
+ if (priv->video_preview != NULL)
+ gtk_widget_hide (priv->video_preview);
+ gtk_widget_show (priv->self_user_avatar_widget);
+ }
+}
+
+static void
empathy_call_window_set_state_connecting (EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
@@ -1754,11 +1784,7 @@ empathy_call_window_sink_added_cb (EmpathyCallHandler *handler,
if (empathy_tp_call_is_sending_video (call))
{
- empathy_call_window_setup_video_preview (self);
-
- if (priv->video_preview != NULL)
- gtk_widget_show (priv->video_preview);
- gtk_widget_hide (priv->self_user_avatar_widget);
+ display_video_preview (self, TRUE);
}
g_object_unref (call);
@@ -2154,7 +2180,7 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window,
default. */
if (send)
{
- empathy_call_window_setup_video_preview (window);
+ display_video_preview (window, TRUE);
}
g_object_get (priv->handler, "tp-call", &call, NULL);
@@ -2205,20 +2231,17 @@ static void
empathy_call_window_always_show_preview_toggled_cb (GtkToggleAction *toggle,
EmpathyCallWindow *window)
{
- gboolean show_preview_toggled;
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- show_preview_toggled = gtk_toggle_action_get_active (toggle);
-
- if (show_preview_toggled)
+ if (gtk_toggle_action_get_active (toggle))
{
- empathy_call_window_setup_video_preview (window);
- gtk_widget_show (priv->self_user_output_frame);
- empathy_call_window_update_self_avatar_visibility (window);
+ display_video_preview (window, TRUE);
}
else
{
- gtk_widget_hide (priv->self_user_output_frame);
+ /* disable preview if we are not sending */
+ if (!priv->sending_video)
+ display_video_preview (window, FALSE);
}
}