pulse: force 16 bit audio sample format

PA_SAMPLE_S16NE is the only sample format which is suported by both MPD and pulseaudio. Unfortunately, pulse does not accept 24 bit samples. Instead of bailing out with an error message, we should tell the MPD core to convert all samples to 16 bit for pulse.

pulse: force 16 bit audio sample format
a02db572 · Max Kellermann · 0fd6fa99 · a02db572
Commit a02db572 authored Oct 25, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

audioOutput_pulse.c src/audioOutputs/audioOutput_pulse.c +3 -5

No files found.
--- a/src/audioOutputs/audioOutput_pulse.c
+++ b/src/audioOutputs/audioOutput_pulse.c
@@ -131,11 +131,9 @@ static int pulse_openDevice(void *data,
 	pd->connAttempts++;
 	pd->lastAttempt = t;

-	if (audioFormat->bits != 16) {
-		ERROR("PulseAudio doesn't support %i bit audio\n",
-		      audioFormat->bits);
-		return -1;
-	}
+	/* MPD doesn't support the other pulseaudio sample formats, so
+	   we just force MPD to send us everything as 16 bit */
+	audioFormat->bits = 16;

 	ss.format = PA_SAMPLE_S16NE;
 	ss.rate = audioFormat->sample_rate;