aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-27 20:53:52 +0100
committerMax Kellermann <max@duempel.org>2008-12-27 20:53:52 +0100
commite8c44782d0014ac72c155616a3b3272824b2ff96 (patch)
tree9e25594b774f96403633551e0e9c738c5d18f633
parentb2fc0ee27415fc76be8fa166bbada4b8b8b024ad (diff)
downloadmpd-e8c44782d0014ac72c155616a3b3272824b2ff96.tar.gz
mpd-e8c44782d0014ac72c155616a3b3272824b2ff96.tar.xz
mpd-e8c44782d0014ac72c155616a3b3272824b2ff96.zip
output_control: no static "notify" initialization
Don't use NOTIFY_INITIALIZER to initialize audio_output_client_notify.
-rw-r--r--src/audio.c4
-rw-r--r--src/output_control.c2
2 files changed, 5 insertions, 1 deletions
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)
{