aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_thread.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-25 17:47:46 +0100
committerMax Kellermann <max@duempel.org>2008-11-25 17:47:46 +0100
commit7918785c78021258131e28a7a534064bdbc85dca (patch)
treea30a9d59d2aa5a612a7b4a7c8cd5043d32eb4920 /src/output_thread.c
parent0277921e6a9a1dd473e1fcfe9e31ca39fa76ddea (diff)
downloadmpd-7918785c78021258131e28a7a534064bdbc85dca.tar.gz
mpd-7918785c78021258131e28a7a534064bdbc85dca.tar.xz
mpd-7918785c78021258131e28a7a534064bdbc85dca.zip
output: use GLib instead of log.h/util.h
Diffstat (limited to '')
-rw-r--r--src/output_thread.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/output_thread.c b/src/output_thread.c
index 45acdd55f..b65a601a3 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -19,9 +19,11 @@
#include "output_thread.h"
#include "output_api.h"
#include "output_internal.h"
-#include "utils.h"
+#include <glib.h>
#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
enum {
/** after a failure, wait this number of seconds before
@@ -46,7 +48,7 @@ static void convertAudioFormat(struct audio_output *audioOutput,
if (size > audioOutput->convBufferLen) {
if (audioOutput->convBuffer != NULL)
free(audioOutput->convBuffer);
- audioOutput->convBuffer = xmalloc(size);
+ audioOutput->convBuffer = g_malloc(size);
audioOutput->convBufferLen = size;
}
@@ -164,5 +166,5 @@ void audio_output_thread_start(struct audio_output *ao)
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (pthread_create(&ao->thread, &attr, audio_output_task, ao))
- FATAL("Failed to spawn output task: %s\n", strerror(errno));
+ g_error("Failed to spawn output task: %s\n", strerror(errno));
}