[empathy] Get the env variable in create_{src,sink} directly
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Get the env variable in create_{src,sink} directly
- Date: Mon, 15 Aug 2011 13:23:50 +0000 (UTC)
commit 0294f04c51a60c155e20a4e5210a8ddd69358ba9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Aug 15 14:59:41 2011 +0200
Get the env variable in create_{src,sink} directly
src/empathy-audio-sink.c | 7 +++++--
src/empathy-audio-src.c | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index c9d7203..5969ea5 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -190,9 +190,12 @@ empathy_audio_sink_get_volume (EmpathyGstAudioSink *sink)
}
static GstElement *
-create_sink (const gchar *description)
+create_sink (void)
{
GstElement *sink;
+ const gchar *description;
+
+ description = g_getenv ("EMPATHY_AUDIO_SINK");
if (description != NULL)
{
@@ -254,7 +257,7 @@ empathy_audio_sink_request_new_pad (GstElement *element,
gst_bin_add (GST_BIN (bin), volume);
- self->priv->sink = create_sink (g_getenv ("EMPATHY_AUDIO_SINK"));
+ self->priv->sink = create_sink ();
if (self->priv->sink == NULL)
goto error;
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 5da4248..8f7a059 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -379,9 +379,12 @@ empathy_audio_src_source_output_index_notify (GObject *object,
}
static GstElement *
-create_src (const gchar *description)
+create_src (void)
{
GstElement *src;
+ const gchar *description;
+
+ description = g_getenv ("EMPATHY_AUDIO_SRC");
if (description != NULL)
{
@@ -416,7 +419,7 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
priv->peak_level = -G_MAXDOUBLE;
priv->lock = g_mutex_new ();
- priv->src = create_src (g_getenv ("EMPATHY_AUDIO_SRC"));
+ priv->src = create_src ();
if (priv->src == NULL)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]