aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-call-window.c
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-07-28 19:45:21 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-07-29 18:02:08 +0800
commita36214f589404b37c6125b0a3faa756f9e001cd6 (patch)
tree0fd32c19514a977f8ae4b1200ad4da16e231577b /src/empathy-call-window.c
parent58df02da291709b265717d8bf2d196e4345ea2ba (diff)
downloadgsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.tar
gsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.tar.gz
gsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.tar.bz2
gsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.tar.lz
gsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.tar.xz
gsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.tar.zst
gsoc2013-empathy-a36214f589404b37c6125b0a3faa756f9e001cd6.zip
call-window: add a Microphone menu to change mic on the fly
Yay! Sorry this commit is kind of big with the addition of mic-menu, perhaps I should have added it in pieces. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/empathy-call-window.c')
-rw-r--r--src/empathy-call-window.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 8407dc852..afd02522b 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -60,6 +60,7 @@
#include "empathy-audio-sink.h"
#include "empathy-video-src.h"
#include "ev-sidebar.h"
+#include "empathy-mic-menu.h"
#define CONTENT_HBOX_BORDER_WIDTH 6
#define CONTENT_HBOX_SPACING 3
@@ -218,6 +219,8 @@ struct _EmpathyCallWindowPriv
gboolean pipeline_playing;
EmpathySoundManager *sound_mgr;
+
+ EmpathyMicMenu *mic_menu;
};
#define GET_PRIV(o) (EMPATHY_CALL_WINDOW (o)->priv)
@@ -1154,6 +1157,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
g_object_unref (gui);
priv->sound_mgr = empathy_sound_manager_dup_singleton ();
+ priv->mic_menu = empathy_mic_menu_new (self);
empathy_call_window_show_hangup_button (self, TRUE);
@@ -1684,6 +1688,8 @@ empathy_call_window_dispose (GObject *object)
tp_clear_object (&priv->sound_mgr);
+ tp_clear_object (&priv->mic_menu);
+
G_OBJECT_CLASS (empathy_call_window_parent_class)->dispose (object);
}