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: Use static string in DBUS signal handler description

Browse source
This commit is contained in:
Frédéric Dalleau 2011-10-04 09:37:26 +02:00 • committed by Arun Raghavan
parent 79c836ec6a
commit 12abb05ebd
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2895,7 +2895,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;
const pa_bluetooth_device *device; const pa_bluetooth_device *device;
pa_assert(m); pa_assert(m);
@ -2978,19 +2978,17 @@ int pa__init(pa_module* m) {
speaker = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='SpeakerGainChanged',path='%s'", u->path); speaker = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='SpeakerGainChanged',path='%s'", u->path);
mike = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='MicrophoneGainChanged',path='%s'", u->path); mike = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='MicrophoneGainChanged',path='%s'", u->path);
transport = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.MediaTransport',member='PropertyChanged'");
if (pa_dbus_add_matches( if (pa_dbus_add_matches(
pa_dbus_connection_get(u->connection), &err, pa_dbus_connection_get(u->connection), &err,
speaker, speaker,
mike, mike,
transport, "type='signal',sender='org.bluez',interface='org.bluez.MediaTransport',member='PropertyChanged'",
"type='signal',sender='org.bluez',interface='org.bluez.HandsfreeGateway',member='PropertyChanged'", "type='signal',sender='org.bluez',interface='org.bluez.HandsfreeGateway',member='PropertyChanged'",
NULL) < 0) { NULL) < 0) {
pa_xfree(speaker); pa_xfree(speaker);
pa_xfree(mike); pa_xfree(mike);
pa_xfree(transport);
pa_log("Failed to add D-Bus matches: %s", err.message); pa_log("Failed to add D-Bus matches: %s", err.message);
goto fail; goto fail;
@ -2998,7 +2996,6 @@ int pa__init(pa_module* m) {
pa_xfree(speaker); pa_xfree(speaker);
pa_xfree(mike); pa_xfree(mike);
pa_xfree(transport);
/* Connect to the BT service */ /* Connect to the BT service */
init_bt(u); init_bt(u);