From 6584897b697e5392c5ef192054991d29aa791842 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 Dec 2011 21:08:15 +0100 Subject: output/null: don't initialize the "timer" attribute in _init() Unnecessary overhead. --- src/output/null_output_plugin.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/output/null_output_plugin.c b/src/output/null_output_plugin.c index e680e617c..0865ae055 100644 --- a/src/output/null_output_plugin.c +++ b/src/output/null_output_plugin.c @@ -45,7 +45,6 @@ null_init(const struct config_param *param, GError **error_r) } nd->sync = config_get_block_bool(param, "sync", true); - nd->timer = NULL; return &nd->base; } @@ -55,8 +54,6 @@ null_finish(struct audio_output *ao) { struct null_data *nd = (struct null_data *)ao; - assert(nd->timer == NULL); - ao_base_finish(&nd->base); g_free(nd); } @@ -78,10 +75,8 @@ null_close(struct audio_output *ao) { struct null_data *nd = (struct null_data *)ao; - if (nd->timer != NULL) { + if (nd->sync) timer_free(nd->timer); - nd->timer = NULL; - } } static size_t -- cgit v1.2.3