From 7ba3797b9006f0a7e048787ee6de91fd05e60d2b Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 4 Feb 2011 14:08:09 +0000 Subject: on the last hurdle --- src/pulseaudio-mgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/pulseaudio-mgr.c') 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)); } } -- cgit v1.2.3