RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao_coreaudio: make variable names shorter 

property_address -> p_addr
This commit is contained in:
Stefano Pigozzi 2013-06-20 13:58:28 +02:00
parent 45479825ba
commit dc8eb9d77a
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
audio/out/ao_coreaudio.c
View File

@ -256,13 +256,13 @@ static OSStatus GetAudioProperty(AudioObjectID id,
AudioObjectPropertySelector selector,
UInt32 outSize, void *outData)
{
AudioObjectPropertyAddress property_address;
AudioObjectPropertyAddress p_addr;
property_address.mSelector = selector;
property_address.mScope = kAudioObjectPropertyScopeGlobal;
property_address.mElement = kAudioObjectPropertyElementMaster;
p_addr.mSelector = selector;
p_addr.mScope = kAudioObjectPropertyScopeGlobal;
p_addr.mElement = kAudioObjectPropertyElementMaster;
return AudioObjectGetPropertyData(id, &property_address, 0, NULL, &outSize,
return AudioObjectGetPropertyData(id, &p_addr, 0, NULL, &outSize,
outData);
}
@ -338,13 +338,13 @@ static OSStatus SetAudioProperty(AudioObjectID id,
AudioObjectPropertySelector selector,
UInt32 inDataSize, void *inData)
{
AudioObjectPropertyAddress property_address;
AudioObjectPropertyAddress p_addr;
property_address.mSelector = selector;
property_address.mScope = kAudioObjectPropertyScopeGlobal;
property_address.mElement = kAudioObjectPropertyElementMaster;
p_addr.mSelector = selector;
p_addr.mScope = kAudioObjectPropertyScopeGlobal;
p_addr.mElement = kAudioObjectPropertyElementMaster;
return AudioObjectSetPropertyData(id, &property_address, 0, NULL,
return AudioObjectSetPropertyData(id, &p_addr, 0, NULL,
inDataSize, inData);
}
@ -352,13 +352,13 @@ static Boolean IsAudioPropertySettable(AudioObjectID id,
AudioObjectPropertySelector selector,
Boolean *outData)
{
AudioObjectPropertyAddress property_address;
AudioObjectPropertyAddress p_addr;
property_address.mSelector = selector;
property_address.mScope = kAudioObjectPropertyScopeGlobal;
property_address.mElement = kAudioObjectPropertyElementMaster;
p_addr.mSelector = selector;
p_addr.mScope = kAudioObjectPropertyScopeGlobal;
p_addr.mElement = kAudioObjectPropertyElementMaster;
return AudioObjectIsPropertySettable(id, &property_address, outData);
return AudioObjectIsPropertySettable(id, &p_addr, outData);
}
static int AudioDeviceSupportsDigital(AudioDeviceID i_dev_id);
@ -685,7 +685,7 @@ static int OpenSPDIF(struct ao *ao)
Boolean b_writeable = 0;
AudioStreamID *p_streams = NULL;
int i, i_streams = 0;
AudioObjectPropertyAddress property_address;
AudioObjectPropertyAddress p_addr;
/* Start doing the SPDIF setup process. */
p->b_digital = 1;
@ -703,12 +703,12 @@ static int OpenSPDIF(struct ao *ao)
goto err_out;
}
property_address.mSelector = kAudioDevicePropertySupportsMixing;
property_address.mScope = kAudioObjectPropertyScopeGlobal;
property_address.mElement = kAudioObjectPropertyElementMaster;
p_addr.mSelector = kAudioDevicePropertySupportsMixing;
p_addr.mScope = kAudioObjectPropertyScopeGlobal;
p_addr.mElement = kAudioObjectPropertyElementMaster;
/* Set mixable to false if we are allowed to. */
if (AudioObjectHasProperty(p->i_selected_dev, &property_address)) {
if (AudioObjectHasProperty(p->i_selected_dev, &p_addr)) {
/* Set mixable to false if we are allowed to. */
err = IsAudioPropertySettable(p->i_selected_dev,
kAudioDevicePropertySupportsMixing,
@ -844,12 +844,12 @@ static int OpenSPDIF(struct ao *ao)
if (!AudioStreamChangeFormat(p->i_stream_id, p->stream_format))
goto err_out;
property_address.mSelector = kAudioDevicePropertyDeviceHasChanged;
property_address.mScope = kAudioObjectPropertyScopeGlobal;
property_address.mElement = kAudioObjectPropertyElementMaster;
p_addr.mSelector = kAudioDevicePropertyDeviceHasChanged;
p_addr.mScope = kAudioObjectPropertyScopeGlobal;
p_addr.mElement = kAudioObjectPropertyElementMaster;
err = AudioObjectAddPropertyListener(p->i_selected_dev,
&property_address,
&p_addr,
DeviceListener,
NULL);
if (err != noErr)
@ -1000,7 +1000,7 @@ static int AudioStreamChangeFormat(AudioStreamID i_stream_id,
{
OSStatus err = noErr;
int i;
AudioObjectPropertyAddress property_address;
AudioObjectPropertyAddress p_addr;
static volatile int stream_format_changed;
stream_format_changed = 0;
@ -1008,12 +1008,12 @@ static int AudioStreamChangeFormat(AudioStreamID i_stream_id,
print_format(MSGL_V, "setting stream format:", &change_format);
/* Install the callback. */
property_address.mSelector = kAudioStreamPropertyPhysicalFormat;
property_address.mScope = kAudioObjectPropertyScopeGlobal;
property_address.mElement = kAudioObjectPropertyElementMaster;
p_addr.mSelector = kAudioStreamPropertyPhysicalFormat;
p_addr.mScope = kAudioObjectPropertyScopeGlobal;
p_addr.mElement = kAudioObjectPropertyElementMaster;
err = AudioObjectAddPropertyListener(i_stream_id,
&property_address,
&p_addr,
StreamListener,
(void *)&stream_format_changed);
if (err != noErr) {
@ -1064,7 +1064,7 @@ static int AudioStreamChangeFormat(AudioStreamID i_stream_id,
/* Removing the property listener. */
err = AudioObjectRemovePropertyListener(i_stream_id,
&property_address,
&p_addr,
StreamListener,
(void *)&stream_format_changed);
if (err != noErr) {