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

bluetooth: update SCO over PCM with latest changes

Browse source
This commit is contained in:
Marc-André Lureau 2009-03-06 14:45:06 +02:00
parent df3f4eef2d
commit af9f92bfaa
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,6 +160,8 @@ struct userdata {
int service_write_type, service_read_type; int service_write_type, service_read_type;
}; };
#define USE_SCO_OVER_PCM(u) (u->profile == PROFILE_HSP && (u->hsp.sco_sink && u->hsp.sco_source))
static int init_bt(struct userdata *u); static int init_bt(struct userdata *u);
static int init_profile(struct userdata *u); static int init_profile(struct userdata *u);
@ -653,7 +655,7 @@ static int set_conf(struct userdata *u) {
return 0; return 0;
} }
/* from IO thread */ /* from IO thread, except in SCO over PCM */
static int start_stream_fd(struct userdata *u) { static int start_stream_fd(struct userdata *u) {
union { union {
bt_audio_msg_header_t rsp; bt_audio_msg_header_t rsp;
@ -1359,8 +1361,6 @@ 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);
} }
#define USE_SCO_OVER_PCM(u) (u->profile == PROFILE_HSP && (u->hsp.sco_sink && u->hsp.sco_source))
static void sco_over_pcm_state_update(struct userdata *u) { static void 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));
@ -1375,11 +1375,14 @@ static void sco_over_pcm_state_update(struct userdata *u) {
if ((init_bt(u) < 0) || (init_profile(u) < 0)) if ((init_bt(u) < 0) || (init_profile(u) < 0))
pa_log("Can't resume SCO over PCM"); pa_log("Can't resume SCO over PCM");
start_stream_fd(u);
} else { } else {
if (u->service_fd < 0) if (u->service_fd < 0)
return; return;
stop_stream_fd(u);
pa_log_debug("Closing SCO over PCM"); pa_log_debug("Closing SCO over PCM");
pa_close(u->service_fd); pa_close(u->service_fd);
u->service_fd = -1; u->service_fd = -1;
@ -1629,15 +1632,19 @@ static int start_thread(struct userdata *u) {
pa_assert(!u->rtpoll); pa_assert(!u->rtpoll);
pa_assert(!u->rtpoll_item); pa_assert(!u->rtpoll_item);
if (USE_SCO_OVER_PCM(u)) {
pa_sink_ref(u->sink);
pa_source_ref(u->source);
return 0;
}
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
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 (start_stream_fd(u) < 0)
return -1;
pa_sink_ref(u->sink);
pa_source_ref(u->source);
/* FIXME: monitor stream_fd error */
return 0;
}
if (!(u->thread = pa_thread_new(thread_func, u))) { if (!(u->thread = pa_thread_new(thread_func, u))) {
pa_log_error("Failed to create IO thread"); pa_log_error("Failed to create IO thread");
stop_thread(u); stop_thread(u);