From cd4964cdeee41abab7773fc0c9dd6d5592351726 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 26 Mar 2009 19:50:02 +0100 Subject: pulse: don't check config_param!=NULL The conf.h functions deal well with config_param==NULL and will return the specified default value then. --- src/mixer/pulse_mixer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer.c index ad84d7301..883a7ffd8 100644 --- a/src/mixer/pulse_mixer.c +++ b/src/mixer/pulse_mixer.c @@ -170,12 +170,9 @@ pulse_mixer_init(const struct config_param *param) pm->volume = g_new(struct pa_cvolume,1); - pm->server = param != NULL - ? config_dup_block_string(param, "server", NULL) : NULL; - pm->sink = param != NULL - ? config_dup_block_string(param, "sink", NULL) : NULL; - pm->output_name = param != NULL - ? config_dup_block_string(param, "name", NULL) : NULL; + pm->server = config_dup_block_string(param, "server", NULL); + pm->sink = config_dup_block_string(param, "sink", NULL); + pm->output_name = config_dup_block_string(param, "name", NULL); return &pm->base; } -- cgit v1.2.3