# HG changeset patch # User adrian # Date 1278882740 0 # Node ID 955cdbd3ac023fa2822d92e27337eb4f7b6675f3 # Parent e55ce930e6aeb39ea712ec1befc82b12f30e2fb3 Fix cosmetics after r31715. diff -r e55ce930e6ae -r 955cdbd3ac02 libao2/ao_coreaudio.c --- a/libao2/ao_coreaudio.c Sun Jul 11 21:08:57 2010 +0000 +++ b/libao2/ao_coreaudio.c Sun Jul 11 21:12:20 2010 +0000 @@ -445,15 +445,15 @@ devid_def = device_id; } - /* Retrieve the name of the device. */ - err = GetAudioPropertyString(devid_def, - kAudioObjectPropertyName, - &psz_name); - if (err != noErr) - { - ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device name: [%4.4s]\n", (char *)&err); - goto err_out; - } + /* Retrieve the name of the device. */ + err = GetAudioPropertyString(devid_def, + kAudioObjectPropertyName, + &psz_name); + if (err != noErr) + { + ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device name: [%4.4s]\n", (char *)&err); + goto err_out; + } ao_msg(MSGT_AO,MSGL_V, "got audio output device ID: %"PRIu32" Name: %s\n", devid_def, psz_name ); @@ -506,6 +506,7 @@ ao_msg(MSGT_AO, MSGL_WARN, "could not check whether device is alive: [%4.4s]\n", (char *)&err); if (!b_alive) ao_msg(MSGT_AO, MSGL_WARN, "device is not alive\n" ); + /* S/PDIF output need device in HogMode. */ err = GetAudioProperty(ao->i_selected_dev, kAudioDevicePropertyHogMode, @@ -615,11 +616,11 @@ *****************************************************************************/ static int OpenSPDIF(void) { - OSStatus err = noErr; - UInt32 i_param_size, b_mix = 0; - Boolean b_writeable = 0; - AudioStreamID *p_streams = NULL; - int i, i_streams = 0; + OSStatus err = noErr; + UInt32 i_param_size, b_mix = 0; + Boolean b_writeable = 0; + AudioStreamID *p_streams = NULL; + int i, i_streams = 0; AudioObjectPropertyAddress property_address; /* Start doing the SPDIF setup process. */