RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-01 20:00:37 +00:00
Code Issues Releases Wiki Activity

ao_coreaudio: fix some naming conventions

Browse Source
This commit is contained in:
Stefano Pigozzi 2014-12-27 12:20:53 +01:00
parent bde7fa5a46
commit 15e30e58b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/out/ao_coreaudio.c
View File

@ -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);