diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-24 23:51:48 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-28 00:33:43 +0800 |
commit | 5432a3fc4003e8285ef230c707ffdfe70b38be90 (patch) | |
tree | 6ef0217d686f688a0c706503a3832aad4d6b9c37 | |
parent | 3d6c558cf87c2a7144c40edecd8cebbfac9a1596 (diff) | |
download | gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.tar gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.tar.gz gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.tar.bz2 gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.tar.lz gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.tar.xz gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.tar.zst gsoc2013-empathy-5432a3fc4003e8285ef230c707ffdfe70b38be90.zip |
connect the 'camera off' and 'preview' buttons
-rw-r--r-- | src/empathy-call-window.c | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 985b55d41..5426e71d4 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -95,6 +95,12 @@ typedef enum { REDIALING } CallState; +typedef enum { + CAMERA_STATE_OFF, + CAMERA_STATE_PREVIEW, + CAMERA_STATE_ON, +} CameraState; + /* private structure */ typedef struct _EmpathyCallWindowPriv EmpathyCallWindowPriv; @@ -127,6 +133,7 @@ struct _EmpathyCallWindowPriv GtkAction *redial; GtkAction *menu_fullscreen; GtkWidget *tool_button_camera_off; + GtkWidget *tool_button_camera_preview; /* The frames and boxes that contain self and remote avatar and video input/output. When we redial, we destroy and re-create the boxes */ @@ -177,6 +184,7 @@ struct _EmpathyCallWindowPriv GMutex *lock; gboolean call_started; gboolean sending_video; + CameraState camera_state; EmpathyCallWindowFullscreen *fullscreen; gboolean is_fullscreen; @@ -263,6 +271,9 @@ static void empathy_call_window_volume_changed_cb (GtkScaleButton *button, gdouble value, EmpathyCallWindow *window); +static void block_camera_control_signals (EmpathyCallWindow *self); +static void unblock_camera_control_signals (EmpathyCallWindow *self); + static void empathy_call_window_setup_toolbar (EmpathyCallWindow *self) { @@ -732,6 +743,84 @@ empathy_call_window_set_state_connecting (EmpathyCallWindow *window) } static void +disable_camera (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + priv->camera_state = CAMERA_STATE_OFF; + display_video_preview (self, FALSE); + + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->camera_button), FALSE); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_preview), FALSE); + unblock_camera_control_signals (self); +} + +static void +tool_button_camera_off_toggled_cb (GtkToggleToolButton *toggle, + EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (!gtk_toggle_tool_button_get_active (toggle)) + { + if (priv->camera_state == CAMERA_STATE_OFF) + { + /* We can't change the state by disabling the button */ + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (toggle, TRUE); + unblock_camera_control_signals (self); + } + + return; + } + + DEBUG ("disable camera"); + disable_camera (self); +} + +static void +enable_preview (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + priv->camera_state = CAMERA_STATE_PREVIEW; + display_video_preview (self, TRUE); + + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_off), FALSE); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->camera_button), FALSE); + unblock_camera_control_signals (self); +} + +static void +tool_button_camera_preview_toggled_cb (GtkToggleToolButton *toggle, + EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (!gtk_toggle_tool_button_get_active (toggle)) + { + if (priv->camera_state == CAMERA_STATE_PREVIEW) + { + /* We can't change the state by disabling the button */ + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (toggle, TRUE); + unblock_camera_control_signals (self); + } + + return; + } + + DEBUG ("enable preview"); + enable_preview (self); +} + +static void empathy_call_window_init (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); @@ -761,6 +850,7 @@ empathy_call_window_init (EmpathyCallWindow *self) "ui_manager", &priv->ui_manager, "menufullscreen", &priv->menu_fullscreen, "camera_off", &priv->tool_button_camera_off, + "camera_preview", &priv->tool_button_camera_preview, NULL); g_free (filename); @@ -775,6 +865,8 @@ empathy_call_window_init (EmpathyCallWindow *self) "always_show_preview", "toggled", empathy_call_window_always_show_preview_toggled_cb, "menufullscreen", "activate", empathy_call_window_fullscreen_cb, + "camera_off", "toggled", tool_button_camera_off_toggled_cb, + "camera_preview", "toggled", tool_button_camera_preview_toggled_cb, NULL); priv->lock = g_mutex_new (); @@ -2467,3 +2559,32 @@ empathy_call_window_volume_changed_cb (GtkScaleButton *button, empathy_audio_sink_set_volume (EMPATHY_GST_AUDIO_SINK (priv->audio_output), value); } + +/* block all the signals related to camera control widgets. This is useful + * when we are manually updating the UI and so don't want to fire the + * callbacks */ +static void +block_camera_control_signals (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + g_signal_handlers_block_by_func (priv->tool_button_camera_off, + tool_button_camera_off_toggled_cb, self); + g_signal_handlers_block_by_func (priv->tool_button_camera_preview, + tool_button_camera_preview_toggled_cb, self); + g_signal_handlers_block_by_func (priv->camera_button, + empathy_call_window_send_video_toggled_cb, self); +} + +static void +unblock_camera_control_signals (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + g_signal_handlers_unblock_by_func (priv->tool_button_camera_off, + tool_button_camera_off_toggled_cb, self); + g_signal_handlers_unblock_by_func (priv->tool_button_camera_preview, + tool_button_camera_preview_toggled_cb, self); + g_signal_handlers_unblock_by_func (priv->camera_button, + empathy_call_window_send_video_toggled_cb, self); +} |