diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-15 20:59:41 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-15 20:59:41 +0800 |
| commit | 0294f04c51a60c155e20a4e5210a8ddd69358ba9 (patch) | |
| tree | 132e022d679cdd832d463a1502b1fee8dd6130b5 | |
| parent | 5cf00f4b947ee9ff59abb4e0054bb54449cde916 (diff) | |
| download | gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.tar gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.tar.gz gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.tar.bz2 gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.tar.lz gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.tar.xz gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.tar.zst gsoc2013-empathy-0294f04c51a60c155e20a4e5210a8ddd69358ba9.zip | |
Get the env variable in create_{src,sink} directly
| -rw-r--r-- | src/empathy-audio-sink.c | 7 | ||||
| -rw-r--r-- | 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 c9d720310..5969ea509 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 5da424810..8f7a0599f 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; |