From e8c44782d0014ac72c155616a3b3272824b2ff96 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 27 Dec 2008 20:53:52 +0100
Subject: [PATCH] output_control: no static "notify" initialization
Don't use NOTIFY_INITIALIZER to initialize audio_output_client_notify.
---
src/audio.c | 4 ++++
src/output_control.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/audio.c b/src/audio.c
index c95b7f7d5..402d6bc28 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -56,6 +56,8 @@ void initAudioDriver(void)
ConfigParam *param = NULL;
unsigned int i;
+ notify_init(&audio_output_client_notify);
+
audioOutputArraySize = audio_output_count();
audioOutputArray = xmalloc(sizeof(struct audio_output) * audioOutputArraySize);
@@ -182,6 +184,8 @@ void finishAudioDriver(void)
free(audioOutputArray);
audioOutputArray = NULL;
audioOutputArraySize = 0;
+
+ notify_deinit(&audio_output_client_notify);
}
bool
diff --git a/src/output_control.c b/src/output_control.c
index 10ad0df51..26e9b3cd3 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -26,7 +26,7 @@
#include <assert.h>
#include <stdlib.h>
-struct notify audio_output_client_notify = NOTIFY_INITIALIZER;
+struct notify audio_output_client_notify;
static void ao_command_wait(struct audio_output *ao)
{