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

use the same service fd shutdown logic when destructing module and changing profile

Browse source
This commit is contained in:
Lennart Poettering 2009-02-12 22:09:00 +01:00
parent b18c8755d6
commit 52bfd47a49
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1412,10 +1412,9 @@ static int add_source(struct userdata *u) {
return 0; return 0;
} }
static int init_bt(struct userdata *u) { static void shutdown_bt(struct userdata *u) {
pa_assert(u); pa_assert(u);
/* shutdown bt */
if (u->stream_fd >= 0) { if (u->stream_fd >= 0) {
pa_close(u->stream_fd); pa_close(u->stream_fd);
u->stream_fd = -1; u->stream_fd = -1;
@ -1425,15 +1424,21 @@ static int init_bt(struct userdata *u) {
pa_close(u->service_fd); pa_close(u->service_fd);
u->service_fd = -1; u->service_fd = -1;
} }
}
static int init_bt(struct userdata *u) {
pa_assert(u);
shutdown_bt(u);
u->stream_write_type = u->stream_read_type = 0; u->stream_write_type = u->stream_read_type = 0;
u->service_write_type = u->stream_write_type = 0; u->service_write_type = u->service_write_type = 0;
/* connect to the bluez audio service */
if ((u->service_fd = bt_audio_service_open()) < 0) { if ((u->service_fd = bt_audio_service_open()) < 0) {
pa_log_error("Couldn't connect to bluetooth audio service"); pa_log_error("Couldn't connect to bluetooth audio service");
return -1; return -1;
} }
pa_log_debug("Connected to the bluetooth audio service"); pa_log_debug("Connected to the bluetooth audio service");
return 0; return 0;
@ -1576,7 +1581,7 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
} }
stop_thread(u); stop_thread(u);
init_bt(u); shutdown_bt(u);
if (u->write_memchunk.memblock) { if (u->write_memchunk.memblock) {
pa_memblock_unref(u->write_memchunk.memblock); pa_memblock_unref(u->write_memchunk.memblock);
@ -1586,6 +1591,7 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
u->profile = *d; u->profile = *d;
u->sample_spec = u->requested_sample_spec; u->sample_spec = u->requested_sample_spec;
init_bt(u);
init_profile(u); init_profile(u);
if (u->sink || u->source) if (u->sink || u->source)
@ -1923,11 +1929,7 @@ void pa__done(pa_module *m) {
if (u->read_smoother) if (u->read_smoother)
pa_smoother_free(u->read_smoother); pa_smoother_free(u->read_smoother);
if (u->stream_fd >= 0) shutdown_bt(u);
pa_close(u->stream_fd);
if (u->service_fd >= 0)
pa_close(u->service_fd);
if (u->device) if (u->device)
pa_bluetooth_device_free(u->device); pa_bluetooth_device_free(u->device);