From 3635c93acbc3da87880e886d924020c427d1774a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 25 Jan 2009 16:04:03 +0100 Subject: conf: allow param==NULL Return the default value in the conf_get_block_*() functions when param==NULL was passed. This simplifies a lot of code, because all initialization can be done in one code path, regardless whether configuration is present. --- src/mixer/alsa_mixer.c | 3 --- src/mixer/oss_mixer.c | 3 --- 2 files changed, 6 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c index d0cfdd5a2..d257dc3e8 100644 --- a/src/mixer/alsa_mixer.c +++ b/src/mixer/alsa_mixer.c @@ -48,9 +48,6 @@ alsa_mixer_configure(struct mixer_data *data, const struct config_param *param) struct alsa_mixer *am = (struct alsa_mixer *)data; const char *value; - if (param == NULL) - return; - value = config_get_block_string(param, "mixer_device", NULL); if (value != NULL) { g_free(am->device); diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c index ed370483d..a72806ead 100644 --- a/src/mixer/oss_mixer.c +++ b/src/mixer/oss_mixer.c @@ -52,9 +52,6 @@ oss_mixer_configure(struct mixer_data *data, const struct config_param *param) struct oss_mixer *om = (struct oss_mixer *) data; const char *value; - if (param == NULL) - return; - value = config_get_block_string(param, "mixer_device", NULL); if (value != NULL) { g_free(om->device); -- cgit v1.2.3