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

bluetooth: use sco_sink/source to start with right state

Browse source 
Note from Tanu Kaskinen: I resolved some conflicts with newer upstream code, so
if this patch is broken, blame me..
This commit is contained in:
Marc-André Lureau 2011-03-28 15:35:15 +03:00 • committed by Colin Guthrie
parent 13849f153c
commit 209b7b781d
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -1871,39 +1871,46 @@ static char *get_name(const char *type, pa_modargs *ma, const char *device_id, p
return pa_sprintf_malloc("bluez_%s.%s", type, n); return pa_sprintf_malloc("bluez_%s.%s", type, n);
} }
static void sco_over_pcm_state_update(struct userdata *u) { static int sco_over_pcm_state_update(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert(USE_SCO_OVER_PCM(u)); pa_assert(USE_SCO_OVER_PCM(u));
if (PA_SINK_IS_OPENED(pa_sink_get_state(u->hsp.sco_sink)) || if (PA_SINK_IS_OPENED(pa_sink_get_state(u->hsp.sco_sink)) ||
PA_SOURCE_IS_OPENED(pa_source_get_state(u->hsp.sco_source))) { PA_SOURCE_IS_OPENED(pa_source_get_state(u->hsp.sco_source))) {
if (u->service_fd >= 0) if (u->service_fd >= 0 && u->stream_fd >= 0)
return; return 0;
init_bt(u); init_bt(u);
pa_log_debug("Resuming SCO over PCM"); pa_log_debug("Resuming SCO over PCM");
if (init_profile(u) < 0) if (init_profile(u) < 0) {
pa_log("Can't resume SCO over PCM"); pa_log("Can't resume SCO over PCM");
return -1;
}
if (u->transport) if (u->transport)
bt_transport_acquire(u, TRUE); return bt_transport_acquire(u, TRUE);
else else
start_stream_fd(u); return start_stream_fd(u);
} else {
if (u->service_fd < 0) } else {
return; if (u->service_fd < 0 && u->stream_fd < 0)
return 0;
pa_log_debug("Closing SCO over PCM");
if (u->transport) if (u->transport)
bt_transport_release(u); bt_transport_release(u);
else else if (u->stream_fd >= 0)
stop_stream_fd(u); stop_stream_fd(u);
pa_log_debug("Closing SCO over PCM"); if (u->service_fd >= 0) {
pa_close(u->service_fd); pa_close(u->service_fd);
u->service_fd = -1; u->service_fd = -1;
}
return 0;
} }
} }
@ -2356,11 +2363,11 @@ static int start_thread(struct userdata *u) {
pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll); pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
if (USE_SCO_OVER_PCM(u)) { if (USE_SCO_OVER_PCM(u)) {
if (u->transport) { if (sco_over_pcm_state_update(u) < 0) {
if (bt_transport_acquire(u, TRUE) < 0) u->sink = NULL;
return -1; u->source = NULL;
} else if (start_stream_fd(u) < 0)
return -1; return -1;
}
pa_sink_ref(u->sink); pa_sink_ref(u->sink);
pa_source_ref(u->source); pa_source_ref(u->source);