diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-24 07:20:36 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-24 07:20:36 +0200 |
| commit | 3cae6856b8c6096b3f932a4ab30476a8d1187e58 (patch) | |
| tree | ce4a7dfea71105b723779b08d37108ec3f258bdd /src/audioOutputs/audioOutput_pulse.c | |
| parent | d32f49a90ba69525884ee6fe4f2055792aa10430 (diff) | |
| download | mpd-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_pulse.c')
| -rw-r--r-- | src/audioOutputs/audioOutput_pulse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c index 8e76b7781..3892b5a25 100644 --- a/src/audioOutputs/audioOutput_pulse.c +++ b/src/audioOutputs/audioOutput_pulse.c @@ -62,6 +62,7 @@ static void freePulseData(PulseData * pd) } static int pulse_initDriver(struct audio_output *audioOutput, + mpd_unused const struct audio_format *audio_format, ConfigParam * param) { BlockParam *server = NULL; @@ -109,17 +110,16 @@ static int pulse_testDefault(void) return 0; } -static int pulse_openDevice(struct audio_output *audioOutput) +static int pulse_openDevice(struct audio_output *audioOutput, + struct audio_format *audioFormat) { PulseData *pd; - struct audio_format *audioFormat; pa_sample_spec ss; time_t t; int error; t = time(NULL); pd = audioOutput->data; - audioFormat = &audioOutput->outAudioFormat; if (pd->connAttempts != 0 && (t - pd->lastAttempt) < CONN_ATTEMPT_INTERVAL) |