aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs/audioOutput_fifo.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-24 07:20:36 +0200
committerMax Kellermann <max@duempel.org>2008-09-24 07:20:36 +0200
commit3cae6856b8c6096b3f932a4ab30476a8d1187e58 (patch)
treece4a7dfea71105b723779b08d37108ec3f258bdd /src/audioOutputs/audioOutput_fifo.c
parentd32f49a90ba69525884ee6fe4f2055792aa10430 (diff)
downloadmpd-3cae6856b8c6096b3f932a4ab30476a8d1187e58.tar.gz
mpd-3cae6856b8c6096b3f932a4ab30476a8d1187e58.tar.xz
mpd-3cae6856b8c6096b3f932a4ab30476a8d1187e58.zip
output: pass audio_format to plugin.init() and plugin.open()
Pass the globally configured audio_format as a const pointer to plugin.init(). plugin.open() gets a writable pointer which contains the audio_format requested by the plugin. Its initial value is either the configured audio_format or the input file's audio_format.
Diffstat (limited to 'src/audioOutputs/audioOutput_fifo.c')
-rw-r--r--src/audioOutputs/audioOutput_fifo.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/audioOutputs/audioOutput_fifo.c b/src/audioOutputs/audioOutput_fifo.c
index be40b25e3..a41284a14 100644
--- a/src/audioOutputs/audioOutput_fifo.c
+++ b/src/audioOutputs/audioOutput_fifo.c
@@ -152,6 +152,7 @@ static int openFifo(FifoData *fd)
}
static int fifo_initDriver(struct audio_output *audioOutput,
+ mpd_unused const struct audio_format *audio_format,
ConfigParam *param)
{
FifoData *fd;
@@ -190,14 +191,15 @@ static void fifo_finishDriver(struct audio_output *audioOutput)
freeFifoData(fd);
}
-static int fifo_openDevice(struct audio_output *audioOutput)
+static int fifo_openDevice(struct audio_output *audioOutput,
+ struct audio_format *audio_format)
{
FifoData *fd = (FifoData *)audioOutput->data;
if (fd->timer)
timer_free(fd->timer);
- fd->timer = timer_new(&audioOutput->outAudioFormat);
+ fd->timer = timer_new(audio_format);
audioOutput->open = 1;