diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2015-04-02 22:01:51 -0700 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-04-03 15:40:01 -0700 |
| commit | 46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece (patch) | |
| tree | eae7a659723e84dc6382cc4a011aa1809342c97c /audio/out/ao_alsa.c | |
| parent | 07671ac57b41710201e9a0f22b8a8d0febad1c37 (diff) | |
| download | mpv-46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece.tar.bz2 mpv-46b9df9f9e1eec5cdaa03ab842b34cf1f2ad9ece.tar.xz | |
audio: make all format query shortcuts macros
af_fmt_is_float and af_fmt_is_planar were previously inconsistent with
AF_FORAMT_IS_SPECIAL/AF_FORMAT_IS_IEC61937
Diffstat (limited to 'audio/out/ao_alsa.c')
| -rw-r--r-- | audio/out/ao_alsa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 1ee662ac77..f84a781e8a 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -467,11 +467,11 @@ static int init_device(struct ao *ao) err = snd_pcm_hw_params_set_format(p->alsa, alsa_hwparams, p->alsa_fmt); CHECK_ALSA_ERROR("Unable to set format"); - snd_pcm_access_t access = af_fmt_is_planar(ao->format) + snd_pcm_access_t access = AF_FORMAT_IS_PLANAR(ao->format) ? SND_PCM_ACCESS_RW_NONINTERLEAVED : SND_PCM_ACCESS_RW_INTERLEAVED; err = snd_pcm_hw_params_set_access(p->alsa, alsa_hwparams, access); - if (err < 0 && af_fmt_is_planar(ao->format)) { + if (err < 0 && AF_FORMAT_IS_PLANAR(ao->format)) { ao->format = af_fmt_from_planar(ao->format); access = SND_PCM_ACCESS_RW_INTERLEAVED; err = snd_pcm_hw_params_set_access(p->alsa, alsa_hwparams, access); @@ -817,7 +817,7 @@ static int play(struct ao *ao, void **data, int samples, int flags) return 0; do { - if (af_fmt_is_planar(ao->format)) { + if (AF_FORMAT_IS_PLANAR(ao->format)) { res = snd_pcm_writen(p->alsa, data, samples); } else { res = snd_pcm_writei(p->alsa, data[0], samples); |