From 7918785c78021258131e28a7a534064bdbc85dca Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 25 Nov 2008 17:47:46 +0100 Subject: output: use GLib instead of log.h/util.h --- src/output_thread.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/output_thread.c') 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 #include +#include +#include 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)); } -- cgit v1.2.3