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: fix set_volume_cb on sco over pcm

Browse source 
The current implementation is totally bogus, it cast the over_sink
userdata to the bluetooth-device userdata... It was failing nicely
because the previous code had a gentle safe-guard in u->profile ==
PROFILE_HSP, and u->profile was just random.

There is no easy way to associate additional data to a sink or
source. Two solutions seems possible: looking up loaded modules and
check which one was handling the sink/source, or using pa_shared. I
went for the second solution.
This commit is contained in:
Marc-André Lureau 2011-03-28 15:35:16 +03:00 • committed by Colin Guthrie
parent 209b7b781d
commit 2386471e10
1 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@
#include <pulsecore/core-rtclock.h> #include <pulsecore/core-rtclock.h>
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
#include <pulsecore/core-error.h> #include <pulsecore/core-error.h>
#include <pulsecore/shared.h>
#include <pulsecore/socket-util.h> #include <pulsecore/socket-util.h>
#include <pulsecore/thread.h> #include <pulsecore/thread.h>
#include <pulsecore/thread-mq.h> #include <pulsecore/thread-mq.h>
@ -1796,14 +1797,21 @@ fail:
/* Run from main thread */ /* Run from main thread */
static void sink_set_volume_cb(pa_sink *s) { static void sink_set_volume_cb(pa_sink *s) {
struct userdata *u = s->userdata;
DBusMessage *m; DBusMessage *m;
dbus_uint16_t gain; dbus_uint16_t gain;
struct userdata *u;
char *k;
pa_assert(s);
pa_assert(s->core);
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) s);
u = pa_shared_get(s->core, k);
pa_xfree(k);
pa_assert(u); pa_assert(u);
pa_assert(u->sink == s);
if (u->profile != PROFILE_HSP) pa_assert(u->profile == PROFILE_HSP);
return;
gain = (pa_cvolume_max(&s->real_volume) * 15) / PA_VOLUME_NORM; gain = (pa_cvolume_max(&s->real_volume) * 15) / PA_VOLUME_NORM;
@ -1820,14 +1828,21 @@ static void sink_set_volume_cb(pa_sink *s) {
/* Run from main thread */ /* Run from main thread */
static void source_set_volume_cb(pa_source *s) { static void source_set_volume_cb(pa_source *s) {
struct userdata *u = s->userdata;
DBusMessage *m; DBusMessage *m;
dbus_uint16_t gain; dbus_uint16_t gain;
struct userdata *u;
char *k;
pa_assert(s);
pa_assert(s->core);
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) s);
u = pa_shared_get(s->core, k);
pa_xfree(k);
pa_assert(u); pa_assert(u);
pa_assert(u->source == s);
if (u->profile != PROFILE_HSP) pa_assert(u->profile == PROFILE_HSP);
return;
gain = (pa_cvolume_max(&s->volume) * 15) / PA_VOLUME_NORM; gain = (pa_cvolume_max(&s->volume) * 15) / PA_VOLUME_NORM;
@ -2685,7 +2700,7 @@ int pa__init(pa_module* m) {
struct userdata *u; struct userdata *u;
const char *address, *path; const char *address, *path;
DBusError err; DBusError err;
char *mike, *speaker, *transport; char *mike, *speaker, *transport, *k;
const pa_bluetooth_device *device; const pa_bluetooth_device *device;
pa_assert(m); pa_assert(m);
@ -2786,6 +2801,18 @@ int pa__init(pa_module* m) {
/* Connect to the BT service */ /* Connect to the BT service */
init_bt(u); init_bt(u);
if (u->hsp.sco_sink) {
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) u->hsp.sco_sink);
pa_shared_set(u->core, k, u);
pa_xfree(k);
}
if (u->hsp.sco_source) {
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) u->hsp.sco_source);
pa_shared_set(u->core, k, u);
pa_xfree(k);
}
if (u->profile != PROFILE_OFF) if (u->profile != PROFILE_OFF)
if (init_profile(u) < 0) if (init_profile(u) < 0)
goto fail; goto fail;
@ -2818,6 +2845,8 @@ int pa__get_n_used(pa_module *m) {
void pa__done(pa_module *m) { void pa__done(pa_module *m) {
struct userdata *u; struct userdata *u;
char *k;
pa_assert(m); pa_assert(m);
if (!(u = m->userdata)) if (!(u = m->userdata))
@ -2858,6 +2887,18 @@ void pa__done(pa_module *m) {
shutdown_bt(u); shutdown_bt(u);
if (u->hsp.sco_sink) {
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) u->hsp.sco_sink);
pa_shared_remove(u->core, k);
pa_xfree(k);
}
if (u->hsp.sco_source) {
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) u->hsp.sco_source);
pa_shared_remove(u->core, k);
pa_xfree(k);
}
if (u->a2dp.buffer) if (u->a2dp.buffer)
pa_xfree(u->a2dp.buffer); pa_xfree(u->a2dp.buffer);