Attachment 113023 Details for Bug 88901 – patch that corrects the err type issue

patch that corrects the err type issue

err-is-osstatus.patch (text/plain), 2.07 KB, created by René J.V. Bertin on 2015-02-01 18:13:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: René J.V. Bertin

Created: 2015-02-01 18:13:24 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/src/modules/macosx/module-coreaudio-device.c b/src/modules/macosx/module-coreaudio-device.c
>index 7b3a002..6dafc7d 100644
>--- a/src/modules/macosx/module-coreaudio-device.c
>+++ b/src/modules/macosx/module-coreaudio-device.c
>@@ -182,7 +182,8 @@ static pa_usec_t get_latency_us(pa_object *o) {
>     pa_sample_spec *ss;
>     bool is_source;
>     UInt32 v = 0, total = 0;
>-    UInt32 err, size = sizeof(v);
>+    OSStatus err;
>+    UInt32 size = sizeof(v);
>     AudioObjectPropertyAddress property_address;
>     AudioObjectID stream_id;
> 
>@@ -213,7 +214,7 @@ static pa_usec_t get_latency_us(pa_object *o) {
>     if (!err)
>         total += v;
>     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 */
>     property_address.mSelector = kAudioDevicePropertyBufferFrameSize;
>@@ -222,7 +223,7 @@ static pa_usec_t get_latency_us(pa_object *o) {
>     if (!err)
>         total += v;
>     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 */
>     property_address.mSelector = kAudioDevicePropertySafetyOffset;
>@@ -231,7 +232,7 @@ static pa_usec_t get_latency_us(pa_object *o) {
>     if (!err)
>         total += v / 2;
>     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.
>      * FIXME: this assumes the stream latency is the same for all streams */
>@@ -246,9 +247,9 @@ static pa_usec_t get_latency_us(pa_object *o) {
>         if (!err)
>             total += v;
>         else
>-            pa_log_warn("Failed to get stream latency: %i", err);
>+            pa_log_warn("Failed to get stream latency: %d", err);
>     } 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);
> }

Actions: View

Attachments on bug 88901: 113023

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.