aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-07-27 00:45:50 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-07-28 16:34:47 +0800
commit77712e75df674fb1f6fb58bd92a26ce75cf41787 (patch)
tree691dd222f542cf5b4705374396d35d1f63f5301f
parent7212c6e568aab0c729c9334b0b7a82e7eb33597d (diff)
downloadgsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.tar
gsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.tar.gz
gsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.tar.bz2
gsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.tar.lz
gsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.tar.xz
gsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.tar.zst
gsoc2013-empathy-77712e75df674fb1f6fb58bd92a26ce75cf41787.zip
audio-src: add the source name to the microphone info struct
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--src/empathy-audio-src.c2
-rw-r--r--src/empathy-audio-src.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index df346ea66..086b0a189 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -118,6 +118,7 @@ operation_get_microphones_free (gpointer data)
{
EmpathyAudioSrcMicrophone *mic = l->data;
+ g_free (mic->name);
g_free (mic->description);
g_slice_free (EmpathyAudioSrcMicrophone, mic);
}
@@ -148,6 +149,7 @@ operation_get_microphones_cb (pa_context *context,
mic = g_slice_new0 (EmpathyAudioSrcMicrophone);
mic->index = info->index;
+ mic->name = g_strdup (info->name);
mic->description = g_strdup (info->description);
/* add it to the queue */
diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index c5887237f..298d59c7d 100644
--- a/src/empathy-audio-src.h
+++ b/src/empathy-audio-src.h
@@ -65,6 +65,7 @@ gdouble empathy_audio_src_get_volume (EmpathyGstAudioSrc *src);
typedef struct
{
guint index;
+ gchar *name;
gchar *description;
} EmpathyAudioSrcMicrophone;