summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-27 12:20:53 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-27 12:33:44 +0100
commit15e30e58b25fd6e5b1542c35353ddd3d0c6db998 (patch)
tree00a403a9d4c66355a0ec7624256bd6359175e8fa /audio/out
parentbde7fa5a463f1e3fea034ed724112f647331d2c9 (diff)
downloadmpv-15e30e58b25fd6e5b1542c35353ddd3d0c6db998.tar.bz2
mpv-15e30e58b25fd6e5b1542c35353ddd3d0c6db998.tar.xz
ao_coreaudio: fix some naming conventions
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/ao_coreaudio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index eaad891d7b..5de675831e 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -187,18 +187,18 @@ static AudioChannelLayout* ca_query_layout(struct ao *ao, void *talloc_ctx)
};
err = AudioObjectGetPropertyDataSize(p->device, &p_addr, 0, NULL, &psize);
- CHECK_CA_ERROR("could not get AUHAL preferred layout (size)");
+ CHECK_CA_ERROR("could not get device preferred layout (size)");
r = talloc_size(talloc_ctx, psize);
err = AudioObjectGetPropertyData(p->device, &p_addr, 0, NULL, &psize, r);
- CHECK_CA_ERROR("could not get AUHAL preferred layout (get)");
+ CHECK_CA_ERROR("could not get device preferred layout (get)");
coreaudio_error:
return r;
}
-static AudioChannelLayout* ca_query_stereo_channels(struct ao *ao, void *talloc_ctx)
+static AudioChannelLayout* ca_query_stereo_layout(struct ao *ao, void *talloc_ctx)
{
struct priv *p = ao->priv;
OSStatus err;
@@ -214,7 +214,7 @@ static AudioChannelLayout* ca_query_stereo_channels(struct ao *ao, void *talloc_
uint32_t psize = sizeof(channels);
err = AudioObjectGetPropertyData(p->device, &p_addr, 0, NULL, &psize, channels);
- CHECK_CA_ERROR("could not get AUHAL preferred stereo layout");
+ CHECK_CA_ERROR("could not get device preferred stereo layout");
psize = sizeof(AudioChannelLayout) + nch * sizeof(AudioChannelDescription);
r = talloc_zero_size(talloc_ctx, psize);
@@ -245,7 +245,7 @@ static bool init_chmap(struct ao *ao)
if (ml && ca_layout_to_mp_chmap(ao, ml, &chmap))
mp_chmap_sel_add_map(&chmap_sel, &chmap);
- AudioChannelLayout *sl = ca_query_stereo_channels(ao, ta_ctx);
+ AudioChannelLayout *sl = ca_query_stereo_layout(ao, ta_ctx);
if (sl && ca_layout_to_mp_chmap(ao, sl, &chmap))
mp_chmap_sel_add_map(&chmap_sel, &chmap);