36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
|
From e7d9f891e2a8e6b670098b80315ca1f0010c35ca Mon Sep 17 00:00:00 2001
|
||
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
Date: Fri, 8 Jan 2010 23:44:42 +0100
|
||
|
Subject: [PATCH] bluetooth: don't hit an assert if latency is queried for a stooped recording stream
|
||
|
|
||
|
https://bugzilla.redhat.com/show_bug.cgi?id=537422
|
||
|
---
|
||
|
src/modules/bluetooth/module-bluetooth-device.c | 10 +++++++---
|
||
|
1 files changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
|
||
|
index 2bbae41..d6868b8 100644
|
||
|
--- a/src/modules/bluetooth/module-bluetooth-device.c
|
||
|
+++ b/src/modules/bluetooth/module-bluetooth-device.c
|
||
|
@@ -972,10 +972,14 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
|
||
|
case PA_SOURCE_MESSAGE_GET_LATENCY: {
|
||
|
pa_usec_t wi, ri;
|
||
|
|
||
|
- wi = pa_smoother_get(u->read_smoother, pa_rtclock_now());
|
||
|
- ri = pa_bytes_to_usec(u->read_index, &u->sample_spec);
|
||
|
+ if (u->read_smoother) {
|
||
|
+ wi = pa_smoother_get(u->read_smoother, pa_rtclock_now());
|
||
|
+ ri = pa_bytes_to_usec(u->read_index, &u->sample_spec);
|
||
|
+
|
||
|
+ *((pa_usec_t*) data) = (wi > ri ? wi - ri : 0) + u->source->thread_info.fixed_latency;
|
||
|
+ } else
|
||
|
+ *((pa_usec_t*) data) = 0;
|
||
|
|
||
|
- *((pa_usec_t*) data) = (wi > ri ? wi - ri : 0) + u->source->thread_info.fixed_latency;
|
||
|
return 0;
|
||
|
}
|
||
|
|
||
|
--
|
||
|
1.6.0.2
|
||
|
|