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/output/jack_plugin.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/output/jack_plugin.c') diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c index 8d09dd1d9..8e4be218d 100644 --- a/src/output/jack_plugin.c +++ b/src/output/jack_plugin.c @@ -60,16 +60,6 @@ mpd_jack_name(const struct jack_data *jd) return audio_output_get_name(jd->ao); } -static struct jack_data * -mpd_jack_new(void) -{ - struct jack_data *ret = g_new(struct jack_data, 1); - - ret->ringbuffer_size = 32768; - - return ret; -} - static void mpd_jack_client_free(struct jack_data *jd) { @@ -188,12 +178,10 @@ mpd_jack_init(struct audio_output *ao, struct jack_data *jd; const char *value; - jd = mpd_jack_new(); + jd = g_new(struct jack_data, 1); jd->ao = ao; g_debug("mpd_jack_init (pid=%d)", getpid()); - if (param == NULL) - return jd; value = config_get_block_string(param, "ports", NULL); if (value != NULL) { -- cgit v1.2.3