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

bluetooth: fail when switching on non-connected profile

Browse source
This commit is contained in:
Marc-André Lureau 2009-03-24 14:38:52 +02:00
parent 62a4e36f5d
commit 61cd6d4c19
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,7 @@ struct userdata {
char *address; char *address;
char *path; char *path;
const pa_bluetooth_device* device;
pa_dbus_connection *connection; pa_dbus_connection *connection;
@ -1733,6 +1734,15 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
d = PA_CARD_PROFILE_DATA(new_profile); d = PA_CARD_PROFILE_DATA(new_profile);
if (u->device->headset_connected <= 0 && *d == PROFILE_HSP) {
pa_log_warn("HSP is not connected, refused to switch profile");
return -1;
}
else if (u->device->audio_sink_connected <= 0 && *d == PROFILE_A2DP) {
pa_log_warn("A2DP is not connected, refused to switch profile");
return -1;
}
if (u->sink) { if (u->sink) {
inputs = pa_sink_move_all_start(u->sink); inputs = pa_sink_move_all_start(u->sink);
#ifdef NOKIA #ifdef NOKIA
@ -1926,7 +1936,6 @@ int pa__init(pa_module* m) {
uint32_t channels; uint32_t channels;
struct userdata *u; struct userdata *u;
const char *address, *path; const char *address, *path;
const pa_bluetooth_device *d;
pa_bluetooth_discovery *y = NULL; pa_bluetooth_discovery *y = NULL;
DBusError err; DBusError err;
char *mike, *speaker; char *mike, *speaker;
@ -1987,11 +1996,11 @@ int pa__init(pa_module* m) {
if (!(y = pa_bluetooth_discovery_get(m->core))) if (!(y = pa_bluetooth_discovery_get(m->core)))
goto fail; goto fail;
if (!(d = find_device(u, y, address, path))) if (!(u->device = find_device(u, y, address, path))) /* should discovery ref be kept? */
goto fail; goto fail;
/* Add the card structure. This will also initialize the default profile */ /* Add the card structure. This will also initialize the default profile */
if (add_card(u, pa_modargs_get_value(ma, "profile", NULL), d) < 0) if (add_card(u, pa_modargs_get_value(ma, "profile", NULL), u->device) < 0)
goto fail; goto fail;
pa_bluetooth_discovery_unref(y); pa_bluetooth_discovery_unref(y);