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

store the module index shifted by 1 to map PA_INVALID_INDEX to NULL

Browse source
This commit is contained in:
Lennart Poettering 2009-02-02 00:25:02 +01:00
parent 69a9ed9ef7
commit 55e6331bed
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/bluetooth/module-bluetooth-discover.c
View file

@ -64,31 +64,31 @@ static void load_module_for_device(struct userdata *u, pa_bluetooth_device *d, p
d->device_connected > 0 && d->device_connected > 0 &&
(d->audio_sink_connected > 0 || d->headset_connected > 0)) { (d->audio_sink_connected > 0 || d->headset_connected > 0)) {
if (PA_PTR_TO_UINT(d->data) == PA_INVALID_INDEX) { if (((uint32_t) PA_PTR_TO_UINT(d->data))-1 == PA_INVALID_INDEX) {
pa_module *m = NULL; pa_module *m = NULL;
char *args; char *args;
/* Oh, awesome, a new device has shown up and been connected! */ /* Oh, awesome, a new device has shown up and been connected! */
args = pa_sprintf_malloc("name=\"%s\" address=\"%s\" path=\"%s\"", d->address, d->address, d->path); args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path);
pa_log_debug("Loading module-bluetooth-device %s", args); pa_log_debug("Loading module-bluetooth-device %s", args);
/* m = pa_module_load(u->module->core, "module-bluetooth-device", args); */ m = pa_module_load(u->module->core, "module-bluetooth-device", args);
pa_xfree(args); pa_xfree(args);
if (m) if (m)
d->data = PA_UINT_TO_PTR(m->index); d->data = PA_UINT_TO_PTR((uint32_t) (m->index+1));
else else
pa_log_debug("Failed to load module for device %s", d->path); pa_log_debug("Failed to load module for device %s", d->path);
} }
} else { } else {
if (PA_PTR_TO_UINT(d->data) != PA_INVALID_INDEX) { if (((uint32_t) PA_PTR_TO_UINT(d->data))-1 != PA_INVALID_INDEX) {
/* Hmm, disconnection? Then let's unload our module */ /* Hmm, disconnection? Then let's unload our module */
pa_log_debug("Unloading module for %s", d->path); pa_log_debug("Unloading module for %s", d->path);
/* pa_module_unload_request_by_index(u->core, PA_PTR_TO_UINT(d->data), TRUE); */ pa_module_unload_request_by_index(u->core, (uint32_t) (PA_PTR_TO_UINT(d->data))-1, TRUE);
d->data = NULL; d->data = NULL;
} }
} }