diff options
| author |  waker <wakeroid@gmail.com> | 2011-04-03 18:58:52 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2011-04-03 18:58:52 +0200 |
| commit | c5581ddefc566f300aad914a19a51e726c6cf897 (patch) | |
| tree | e0346a001a405474341a5ce8d30bbd5bc0fe6225 /plugins/alsa | |
| parent | 10249d722b3332630a85ebb1bde1b72cf4f151ec (diff) | |
fixed alsa sampleformat selection order
Diffstat (limited to 'plugins/alsa')
| -rw-r--r-- | plugins/alsa/alsa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index b5de58ac..809cb7ed 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -187,6 +187,7 @@ retry: if ((err = snd_pcm_hw_params_set_format (audio, hw_params, sample_fmt)) < 0) { fprintf (stderr, "cannot set sample format (%s), trying all supported formats\n", snd_strerror (err)); + int fmt_cnt[] = { 16, 24, 32, 32, 8 }; #if WORDS_BIGENDIAN int fmt[] = { SND_PCM_FORMAT_S16_BE, SND_PCM_FORMAT_S24_3BE, SND_PCM_FORMAT_S32_BE, SND_PCM_FORMAT_FLOAT_BE, SND_PCM_FORMAT_S8, -1 }; #else @@ -196,7 +197,7 @@ retry: // 1st try formats with higher bps int i = 0; for (i = 0; fmt[i] != -1; i++) { - if (fmt[i] != sample_fmt && fmt[i] > sample_fmt) { + if (fmt[i] != sample_fmt && fmt_cnt[i] > plugin.fmt.bps) { if (snd_pcm_hw_params_set_format (audio, hw_params, fmt[i]) >= 0) { break; } @@ -206,7 +207,7 @@ retry: // next try formats with lower bps i = 0; for (i = 0; fmt[i] != -1; i++) { - if (fmt[i] != sample_fmt && fmt[i] < sample_fmt) { + if (fmt[i] != sample_fmt && fmt_cnt[i] < plugin.fmt.bps) { if (snd_pcm_hw_params_set_format (audio, hw_params, fmt[i]) >= 0) { break; } |