mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

coreaudio: Change error type to OSStatus

Browse source 
CoreAudio routines that return an error status do so with the
OSStatus type, which is not a UInt32: typical OS X errors are
negative numbers.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
René J. V. Bertin 2015-04-01 09:43:05 +02:00 • committed by David Henningsson
parent 1f659cc836
commit 5f24529316
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/macosx/module-coreaudio-device.c
View file

@ -180,7 +180,8 @@ static pa_usec_t get_latency_us(pa_object *o) {
pa_sample_spec *ss; pa_sample_spec *ss;
bool is_source; bool is_source;
UInt32 v = 0, total = 0; UInt32 v = 0, total = 0;
UInt32 err, size = sizeof(v); OSStatus err;
UInt32 size = sizeof(v);
AudioObjectPropertyAddress property_address; AudioObjectPropertyAddress property_address;
AudioObjectID stream_id; AudioObjectID stream_id;
@ -211,7 +212,7 @@ static pa_usec_t get_latency_us(pa_object *o) {
if (!err) if (!err)
total += v; total += v;
else else
pa_log_warn("Failed to get device latency: %i", err); pa_log_warn("Failed to get device latency: %d", err);
/* the IOProc buffer size */ /* the IOProc buffer size */
property_address.mSelector = kAudioDevicePropertyBufferFrameSize; property_address.mSelector = kAudioDevicePropertyBufferFrameSize;
@ -220,7 +221,7 @@ static pa_usec_t get_latency_us(pa_object *o) {
if (!err) if (!err)
total += v; total += v;
else else
pa_log_warn("Failed to get buffer frame size: %i", err); pa_log_warn("Failed to get buffer frame size: %d", err);
/* IOProc safety offset - this value is the same for both directions, hence we divide it by 2 */ /* IOProc safety offset - this value is the same for both directions, hence we divide it by 2 */
property_address.mSelector = kAudioDevicePropertySafetyOffset; property_address.mSelector = kAudioDevicePropertySafetyOffset;
@ -229,7 +230,7 @@ static pa_usec_t get_latency_us(pa_object *o) {
if (!err) if (!err)
total += v / 2; total += v / 2;
else else
pa_log_warn("Failed to get safety offset: %i", err); pa_log_warn("Failed to get safety offset: %d", err);
/* get the stream latency. /* get the stream latency.
* FIXME: this assumes the stream latency is the same for all streams */ * FIXME: this assumes the stream latency is the same for all streams */
@ -244,9 +245,9 @@ static pa_usec_t get_latency_us(pa_object *o) {
if (!err) if (!err)
total += v; total += v;
else else
pa_log_warn("Failed to get stream latency: %i", err); pa_log_warn("Failed to get stream latency: %d", err);
} else } else
pa_log_warn("Failed to get streams: %i", err); pa_log_warn("Failed to get streams: %d", err);
return pa_bytes_to_usec(total * pa_frame_size(ss), ss); return pa_bytes_to_usec(total * pa_frame_size(ss), ss);
} }