Changeset 657

Timestamp:

04/07/13 20:15:59 (11 years ago)

Author:

Nicholas Riley

Message:

AudioDevicemodule.c: Make error handling more useful and consistent.
Make spacing consistent. Ignore sporadic kAudioHardwareBadObjectError.

File:

• trunk/StreamVision/AudioDevicemodule.c (modified) (4 diffs)

trunk/StreamVision/AudioDevicemodule.c

@@ -1 +1 @@
 #include "Python.h"
 #include <AudioToolbox/AudioServices.h>
+
+#define FourCC2Str(code) (char[5]){(code >> 24) & 0xFF, (code >> 16) & 0xFF, (code >> 8) & 0xFF, code & 0xFF, 0}
+
+static PyObject *
+OSError_from_HALError(const char *failed_operation, OSStatus err) {
+    // these error codes are actually mnemonic, so display them
+    return PyErr_Format(PyExc_OSError,
+                        "%s failed (%ld - %s)",
+                        failed_operation, (long)err, FourCC2Str(err));
+}
 
 static PyObject *
@@ -17 +27 @@
                                             &size, &deviceID);
   if (err != noErr)
-    return PyErr_Format(PyExc_OSError,
-                        "AudioHardwareServiceGetPropertyData failed (%ld)",
-                        (long)err);
+    return OSError_from_HALError("AudioHardwareServiceGetPropertyData", err);
   
   if (deviceID == kAudioDeviceUnknown)
@@ -29 +37 @@
                                    &propertyAddress, 0, NULL,
                                    &size, &transportType);
+  if (err == kAudioHardwareBadObjectError)
+    Py_RETURN_NONE;
   if (err != noErr)
-    return PyErr_Format(PyExc_OSError,
-                        "AudioObjectGetPropertyData failed (%ld)",
-                        (long)err);
+    return OSError_from_HALError("AudioObjectGetPropertyData", err);
 
   if (transportType == kAudioDeviceTransportTypeAirPlay)
-      Py_RETURN_TRUE;
+    Py_RETURN_TRUE;
   else
-      Py_RETURN_FALSE;
+    Py_RETURN_FALSE;
 }
 
@@ -78 +86 @@
                                          NULL);
     if (err != noErr)
-      return PyErr_Format(PyExc_OSError,
-                          "AudioObjectAddPropertyListener failed (%ld)",
-                          (long)err);
+      return OSError_from_HALError("AudioObjectAddPropertyListener", err);
   } else {
     Py_DECREF(default_output_device_changed_callback);