diff options
| author | Max Kellermann <max@duempel.org> | 2009-03-26 19:50:02 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-03-26 19:50:02 +0100 |
| commit | cd4964cdeee41abab7773fc0c9dd6d5592351726 (patch) | |
| tree | ce805b597caa7151fb922c3e3cd22de056d8a6b5 | |
| parent | 74273d419a7157d59682abc9a459cbeb793858c4 (diff) | |
| download | mpd-cd4964cdeee41abab7773fc0c9dd6d5592351726.tar.gz mpd-cd4964cdeee41abab7773fc0c9dd6d5592351726.tar.xz mpd-cd4964cdeee41abab7773fc0c9dd6d5592351726.zip | |
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.
| -rw-r--r-- | src/mixer/pulse_mixer.c | 9 | ||||
| -rw-r--r-- | src/output/pulse_plugin.c | 6 |
2 files changed, 5 insertions, 10 deletions
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; } diff --git a/src/output/pulse_plugin.c b/src/output/pulse_plugin.c index 08ce32365..fdab02599 100644 --- a/src/output/pulse_plugin.c +++ b/src/output/pulse_plugin.c @@ -70,10 +70,8 @@ pulse_init(G_GNUC_UNUSED const struct audio_format *audio_format, pd = pulse_new_data(); pd->name = config_get_block_string(param, "name", "mpd_pulse"); - pd->server = param != NULL - ? config_dup_block_string(param, "server", NULL) : NULL; - pd->sink = param != NULL - ? config_dup_block_string(param, "sink", NULL) : NULL; + pd->server = config_dup_block_string(param, "server", NULL); + pd->sink = config_dup_block_string(param, "sink", NULL); return pd; } |