aboutsummaryrefslogtreecommitdiff
path: root/src/pulseaudio-mgr.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-02-04 14:08:09 +0000
committerConor Curran <conor.curran@canonical.com>2011-02-04 14:08:09 +0000
commit7ba3797b9006f0a7e048787ee6de91fd05e60d2b (patch)
tree5f15b80dad79e31fcd7cbbc5bcfd9c0e9c746101 /src/pulseaudio-mgr.c
parentad214980e84c32ac93b43301f54406c6952c0819 (diff)
downloadayatana-indicator-sound-7ba3797b9006f0a7e048787ee6de91fd05e60d2b.tar.gz
ayatana-indicator-sound-7ba3797b9006f0a7e048787ee6de91fd05e60d2b.tar.bz2
ayatana-indicator-sound-7ba3797b9006f0a7e048787ee6de91fd05e60d2b.zip
on the last hurdle
Diffstat (limited to 'src/pulseaudio-mgr.c')
-rw-r--r--src/pulseaudio-mgr.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/pulseaudio-mgr.c b/src/pulseaudio-mgr.c
index 5089e23..28340b7 100644
--- a/src/pulseaudio-mgr.c
+++ b/src/pulseaudio-mgr.c
@@ -62,7 +62,7 @@ static void pm_update_active_sink (pa_context *c,
void *userdata);
-static void populate_active_sink (const pa_sink_info *info, ActiveSink* sink);
+static void pm_populate_active_sink (const pa_sink_info *info, ActiveSink* sink);
static gboolean reconnect_to_pulse (gpointer user_data);
static pa_cvolume construct_mono_volume(const pa_cvolume* vol);
@@ -143,10 +143,8 @@ reconnect_to_pulse (gpointer user_data)
}
static void
-populate_active_sink (const pa_sink_info *info, ActiveSink* sink)
+pm_populate_active_sink (const pa_sink_info *info, ActiveSink* sink)
{
- sink_details *details;
- details = g_new0 (sink_details, 1);
details->index = info->index;
details->name = g_strdup (info->name);
details->mute = !!info->mute;
@@ -351,7 +349,7 @@ pm_default_sink_info_callback (pa_context *c,
}
g_debug ("server has handed us a default sink");
- populate_active_sink (info, ACTIVE_SINK (userdata));
+ pm_populate_active_sink (info, ACTIVE_SINK (userdata));
}
}