From 3cae6856b8c6096b3f932a4ab30476a8d1187e58 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 24 Sep 2008 07:20:36 +0200 Subject: 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. --- src/audioOutputs/audioOutput_oss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/audioOutputs/audioOutput_oss.c') diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c index f65312fc9..5f8db8276 100644 --- a/src/audioOutputs/audioOutput_oss.c +++ b/src/audioOutputs/audioOutput_oss.c @@ -375,6 +375,7 @@ static int oss_open_default(mpd_unused struct audio_output *ao, } static int oss_initDriver(struct audio_output *audioOutput, + mpd_unused const struct audio_format *audio_format, ConfigParam * param) { OssData *od = newOssData(); @@ -480,11 +481,11 @@ fail: return -1; } -static int oss_openDevice(struct audio_output *audioOutput) +static int oss_openDevice(struct audio_output *audioOutput, + struct audio_format *audioFormat) { int ret; OssData *od = audioOutput->data; - struct audio_format *audioFormat = &audioOutput->outAudioFormat; od->channels = (mpd_sint8)audioFormat->channels; od->sampleRate = audioFormat->sampleRate; -- cgit v1.2.3