From 58df02da291709b265717d8bf2d196e4345ea2ba Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 28 Jul 2011 12:38:26 +0100 Subject: call-window: add getters for the UI manager and audio src Signed-off-by: Jonny Lamb --- src/empathy-call-window.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/empathy-call-window.c') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 3bd6d746d..8407dc852 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -3257,3 +3257,19 @@ empathy_call_window_volume_changed_cb (GtkScaleButton *button, empathy_audio_sink_set_volume (EMPATHY_GST_AUDIO_SINK (priv->audio_output), value); } + +GtkUIManager * +empathy_call_window_get_ui_manager (EmpathyCallWindow *window) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (window); + + return priv->ui_manager; +} + +EmpathyGstAudioSrc * +empathy_call_window_get_audio_src (EmpathyCallWindow *window) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (window); + + return (EmpathyGstAudioSrc *) priv->audio_input; +} -- cgit v1.2.3 From a36214f589404b37c6125b0a3faa756f9e001cd6 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 28 Jul 2011 12:45:21 +0100 Subject: 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 --- src/empathy-call-window.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/empathy-call-window.c') 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); } -- cgit v1.2.3