diff options
| author | Marc-André Lureau <marc-andre.lureau@nokia.com> | 2009-03-19 16:48:31 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marc-andre.lureau@nokia.com> | 2009-03-19 17:33:34 +0200 |
| commit | e83621724d7939b97b4f01f0d7e965d61ef8e55e (patch) | |
| tree | a81aa5ee2aa7b48e2c7a23cfc63723909f3caf76 /src | |
| parent | f1daa282f030e4e2381341e0f65faca47c4b891b (diff) | |
bluetooth: rework the info_valid logic to be more tolerant
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 5213ad65..912697e6 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -114,15 +114,14 @@ void pa_bluetooth_device_free(pa_bluetooth_device *d) { static pa_bool_t device_is_loaded(pa_bluetooth_device *d) { pa_assert(d); - return d->device_info_valid && d->audio_sink_info_valid && d->headset_info_valid; + return d->device_info_valid && (d->audio_sink_info_valid || d->headset_info_valid); } static pa_bool_t device_is_audio(pa_bluetooth_device *d) { pa_assert(d); pa_assert(d->device_info_valid); - pa_assert(d->audio_sink_info_valid); - pa_assert(d->headset_info_valid); + pa_assert(d->audio_sink_info_valid || d->headset_info_valid); return d->device_info_valid > 0 && (d->audio_sink_info_valid > 0 || d->headset_info_valid > 0); |