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_fifo.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/audioOutputs/audioOutput_fifo.c') diff --git a/src/audioOutputs/audioOutput_fifo.c b/src/audioOutputs/audioOutput_fifo.c index a539856c1..60c951387 100644 --- a/src/audioOutputs/audioOutput_fifo.c +++ b/src/audioOutputs/audioOutput_fifo.c @@ -151,7 +151,8 @@ static int openFifo(FifoData *fd) return 0; } -static int fifo_initDriver(AudioOutput *audioOutput, ConfigParam *param) +static int fifo_initDriver(struct audio_output *audioOutput, + ConfigParam *param) { FifoData *fd; BlockParam *blockParam; @@ -181,7 +182,7 @@ static int fifo_initDriver(AudioOutput *audioOutput, ConfigParam *param) return 0; } -static void fifo_finishDriver(AudioOutput *audioOutput) +static void fifo_finishDriver(struct audio_output *audioOutput) { FifoData *fd = (FifoData *)audioOutput->data; @@ -189,7 +190,7 @@ static void fifo_finishDriver(AudioOutput *audioOutput) freeFifoData(fd); } -static int fifo_openDevice(AudioOutput *audioOutput) +static int fifo_openDevice(struct audio_output *audioOutput) { FifoData *fd = (FifoData *)audioOutput->data; @@ -203,7 +204,7 @@ static int fifo_openDevice(AudioOutput *audioOutput) return 0; } -static void fifo_closeDevice(AudioOutput *audioOutput) +static void fifo_closeDevice(struct audio_output *audioOutput) { FifoData *fd = (FifoData *)audioOutput->data; @@ -215,7 +216,7 @@ static void fifo_closeDevice(AudioOutput *audioOutput) audioOutput->open = 0; } -static void fifo_dropBufferedAudio(AudioOutput *audioOutput) +static void fifo_dropBufferedAudio(struct audio_output *audioOutput) { FifoData *fd = (FifoData *)audioOutput->data; char buf[FIFO_BUFFER_SIZE]; @@ -232,7 +233,7 @@ static void fifo_dropBufferedAudio(AudioOutput *audioOutput) } } -static int fifo_playAudio(AudioOutput *audioOutput, +static int fifo_playAudio(struct audio_output *audioOutput, const char *playChunk, size_t size) { FifoData *fd = (FifoData *)audioOutput->data; @@ -271,7 +272,7 @@ static int fifo_playAudio(AudioOutput *audioOutput, return 0; } -AudioOutputPlugin fifoPlugin = { +struct audio_output_plugin fifoPlugin = { "fifo", NULL, /* testDefaultDeviceFunc */ fifo_initDriver, -- cgit v1.2.3