diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-10 17:11:34 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-02 22:29:50 +0100 |
| commit | c412d6251e9cd3abe735b7622af4003502e54f72 (patch) | |
| tree | 7344c13f62e4cc788c830c05d21bb7b5b47f5866 /src/output/openal_plugin.c | |
| parent | 68c2cfbb4067b2292e1ff1d4e7716ff370903f84 (diff) | |
| download | mpd-c412d6251e9cd3abe735b7622af4003502e54f72.tar.gz mpd-c412d6251e9cd3abe735b7622af4003502e54f72.tar.xz mpd-c412d6251e9cd3abe735b7622af4003502e54f72.zip | |
audio_format: changed "bits" to "enum sample_format"
This patch prepares support for floating point samples (and probably
other formats). It changes the meaning of the "bits" attribute from a
bit count to a symbolic value.
Diffstat (limited to '')
| -rw-r--r-- | src/output/openal_plugin.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/output/openal_plugin.c b/src/output/openal_plugin.c index 8fda110e1..0aded4d9a 100644 --- a/src/output/openal_plugin.c +++ b/src/output/openal_plugin.c @@ -58,25 +58,29 @@ openal_output_quark(void) static ALenum openal_audio_format(struct audio_format *audio_format) { - /* Only 8 and 16 bit samples are supported */ - if (audio_format->bits != 16 && audio_format->bits != 8) - audio_format->bits = 16; - - switch (audio_format->bits) - { - case 16: + switch (audio_format->format) { + case SAMPLE_FORMAT_S16: if (audio_format->channels == 2) return AL_FORMAT_STEREO16; if (audio_format->channels == 1) return AL_FORMAT_MONO16; break; - case 8: + case SAMPLE_FORMAT_S8: if (audio_format->channels == 2) return AL_FORMAT_STEREO8; if (audio_format->channels == 1) return AL_FORMAT_MONO8; break; + + default: + /* fall back to 16 bit */ + audio_format->format = SAMPLE_FORMAT_S16; + if (audio_format->channels == 2) + return AL_FORMAT_STEREO16; + if (audio_format->channels == 1) + return AL_FORMAT_MONO16; + break; } return 0; |