diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-10 10:44:04 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-10 10:44:04 +0100 |
| commit | b8cda53bd36809b6f61c2e42a673dfdcd43f0c1d (patch) | |
| tree | 297e3f5d87d2304a7311549399d1896d377d0099 /src/OutputAll.cxx | |
| parent | e0a97a030fc4c6f978b2855c32f5da98b3e7fb78 (diff) | |
notify: convert to C++
Diffstat (limited to 'src/OutputAll.cxx')
| -rw-r--r-- | src/OutputAll.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx index f83f51c0..a18a6338 100644 --- a/src/OutputAll.cxx +++ b/src/OutputAll.cxx @@ -32,10 +32,7 @@ extern "C" { #include "MusicChunk.hxx" #include "mpd_error.h" #include "conf.h" - -extern "C" { -#include "notify.h" -} +#include "notify.hxx" #include <assert.h> #include <string.h> @@ -113,8 +110,6 @@ audio_output_all_init(struct player_control *pc) unsigned int i; GError *error = NULL; - notify_init(&audio_output_client_notify); - num_audio_outputs = audio_output_config_count(); audio_outputs = g_new(struct audio_output *, num_audio_outputs); @@ -161,8 +156,6 @@ audio_output_all_finish(void) g_free(audio_outputs); audio_outputs = NULL; num_audio_outputs = 0; - - notify_deinit(&audio_output_client_notify); } void @@ -211,7 +204,7 @@ audio_output_all_finished(void) static void audio_output_wait_all(void) { while (!audio_output_all_finished()) - notify_wait(&audio_output_client_notify); + audio_output_client_notify.Wait(); } /** |