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/jack_output_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 'src/output/jack_output_plugin.c')
| -rw-r--r-- | src/output/jack_output_plugin.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c index 7e5a52993..f50bc37d0 100644 --- a/src/output/jack_output_plugin.c +++ b/src/output/jack_output_plugin.c @@ -157,8 +157,9 @@ set_audioformat(struct jack_data *jd, struct audio_format *audio_format) else if (audio_format->channels > jd->num_source_ports) audio_format->channels = 2; - if (audio_format->bits != 16 && audio_format->bits != 24) - audio_format->bits = 24; + if (audio_format->format != SAMPLE_FORMAT_S16 && + audio_format->format != SAMPLE_FORMAT_S24_P32) + audio_format->format = SAMPLE_FORMAT_S24_P32; } static void @@ -606,13 +607,13 @@ static void mpd_jack_write_samples(struct jack_data *jd, const void *src, unsigned num_samples) { - switch (jd->audio_format.bits) { - case 16: + switch (jd->audio_format.format) { + case SAMPLE_FORMAT_S16: mpd_jack_write_samples_16(jd, (const int16_t*)src, num_samples); break; - case 24: + case SAMPLE_FORMAT_S24_P32: mpd_jack_write_samples_24(jd, (const int32_t*)src, num_samples); break; |