From 3b09c54b6769c7e0c8152dde2850a88f51e2f3d9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 7 Sep 2008 22:41:22 +0200 Subject: output: renamed typedef AudioOutput to struct audio_output Also rename AudioOutputPlugin to struct audio_output_plugin, and use forward declarations to reduce include dependencies. --- src/audioOutputs/audioOutput_osx.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/audioOutputs/audioOutput_osx.c') diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c index f0fee15e9..1cdcb473c 100644 --- a/src/audioOutputs/audioOutput_osx.c +++ b/src/audioOutputs/audioOutput_osx.c @@ -80,7 +80,8 @@ static int osx_testDefault() return 0; } -static int osx_initDriver(AudioOutput * audioOutput, ConfigParam * param) +static int osx_initDriver(struct audio_output *audioOutput, + ConfigParam * param) { OsxData *od = newOsxData(); @@ -98,13 +99,13 @@ static void freeOsxData(OsxData * od) free(od); } -static void osx_finishDriver(AudioOutput * audioOutput) +static void osx_finishDriver(struct audio_output *audioOutput) { OsxData *od = (OsxData *) audioOutput->data; freeOsxData(od); } -static void osx_dropBufferedAudio(AudioOutput * audioOutput) +static void osx_dropBufferedAudio(struct audio_output *audioOutput) { OsxData *od = (OsxData *) audioOutput->data; @@ -113,7 +114,7 @@ static void osx_dropBufferedAudio(AudioOutput * audioOutput) pthread_mutex_unlock(&od->mutex); } -static void osx_closeDevice(AudioOutput * audioOutput) +static void osx_closeDevice(struct audio_output *audioOutput) { OsxData *od = (OsxData *) audioOutput->data; @@ -215,7 +216,7 @@ static OSStatus osx_render(void *vdata, return 0; } -static int osx_openDevice(AudioOutput * audioOutput) +static int osx_openDevice(struct audio_output *audioOutput) { OsxData *od = (OsxData *) audioOutput->data; ComponentDescription desc; @@ -295,7 +296,7 @@ static int osx_openDevice(AudioOutput * audioOutput) return 0; } -static int osx_play(AudioOutput * audioOutput, +static int osx_play(struct audio_output *audioOutput, const char *playChunk, size_t size) { OsxData *od = (OsxData *) audioOutput->data; @@ -354,7 +355,7 @@ static int osx_play(AudioOutput * audioOutput, return 0; } -AudioOutputPlugin osxPlugin = { +struct audio_output_plugin osxPlugin = { "osx", osx_testDefault, osx_initDriver, -- cgit v1.2.3