From 08129125b6f3d5b194f3586a97f653918ca55c50 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Fri, 11 May 2012 12:09:19 -0400 Subject: s/pulse_sink_new/sink_new/g --- pulsemix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pulsemix.c b/pulsemix.c index 498ed05..1d35a44 100644 --- a/pulsemix.c +++ b/pulsemix.c @@ -154,15 +154,13 @@ static void sink_mute(struct pulseaudio_t *pulse, struct sink_t *sink) sink_set_mute(pulse, sink, 1); } -static struct sink_t *pulse_sink_new(const pa_sink_info *info) +static struct sink_t *sink_new(const pa_sink_info *info) { struct sink_t *sink = calloc(1, sizeof(struct sink_t)); sink->idx = info->index; sink->name = info->name; sink->desc = info->description; - sink->volume.channels = info->volume.channels; - memcpy(&sink->volume, &info->volume, sizeof(pa_cvolume)); sink->volume_percent = (int)(((double)pa_cvolume_avg(&sink->volume) * 100) / PA_VOLUME_NORM); @@ -204,7 +202,7 @@ static void sink_add_cb(pa_context UNUSED *c, const pa_sink_info *i, int eol, if (eol) return; - sink = pulse_sink_new(i); + sink = sink_new(i); if (pulse->sink == NULL) pulse->sink = sink; -- cgit v1.2.3