]> code.delx.au - pulseaudio/commitdiff
bluetooth: rework the info_valid logic to be more tolerant
authorMarc-André Lureau <marc-andre.lureau@nokia.com>
Thu, 19 Mar 2009 14:48:31 +0000 (16:48 +0200)
committerMarc-André Lureau <marc-andre.lureau@nokia.com>
Thu, 19 Mar 2009 15:33:34 +0000 (17:33 +0200)
src/modules/bluetooth/bluetooth-util.c

index 5213ad65a98d2b82d46045273b97f9ffc9a951bc..912697e6f7b2f569f2acf68e678b159d4b590a5a 100644 (file)
@@ -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);