Mercurial > mplayer.hg

changeset 31650:955cdbd3ac02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix cosmetics after r31715.
author adrian
date Sun, 11 Jul 2010 21:12:20 +0000
parents e55ce930e6ae
children 1b5102a113e0
files libao2/ao_coreaudio.c
diffstat 1 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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. */