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

Merge commit '2d903bae9a'

Browse source
This commit is contained in:
Lennart Poettering 2009-03-19 12:56:41 +01:00
commit 9744595571
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/bluetooth/bluetooth-util.c
View file

@ -604,7 +604,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
pa_bluetooth_device_free(d); pa_bluetooth_device_free(d);
} }
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Adapter", "DeviceCreated")) { } else if (dbus_message_is_signal(m, "org.bluez.Adapter", "DeviceCreated")) {
const char *path; const char *path;
@ -617,7 +617,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
pa_log_debug("Device %s created", path); pa_log_debug("Device %s created", path);
found_device(y, path); found_device(y, path);
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Manager", "AdapterAdded")) { } else if (dbus_message_is_signal(m, "org.bluez.Manager", "AdapterAdded")) {
const char *path; const char *path;
@ -630,7 +630,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
pa_log_debug("Adapter %s created", path); pa_log_debug("Adapter %s created", path);
found_adapter(y, path); found_adapter(y, path);
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Headset", "PropertyChanged") || } else if (dbus_message_is_signal(m, "org.bluez.Headset", "PropertyChanged") ||
dbus_message_is_signal(m, "org.bluez.AudioSink", "PropertyChanged") || dbus_message_is_signal(m, "org.bluez.AudioSink", "PropertyChanged") ||
@ -663,7 +663,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
run_callback(y, d, TRUE); run_callback(y, d, TRUE);
} }
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
fail: fail:

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

@ -700,6 +700,9 @@ static int start_stream_fd(struct userdata *u) {
pollfd->fd = u->stream_fd; pollfd->fd = u->stream_fd;
pollfd->events = pollfd->revents = 0; pollfd->events = pollfd->revents = 0;
u->read_index = 0;
u->write_index = 0;
return 0; return 0;
} }

4
src/modules/bluetooth/module-bluetooth-proximity.c
View file

@ -302,7 +302,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *m,
bonding_new(u, a); bonding_new(u, a);
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Adapter", "BondingRemoved")) { } else if (dbus_message_is_signal(m, "org.bluez.Adapter", "BondingRemoved")) {
@ -315,7 +315,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *m,
bonding_remove(u, a); bonding_remove(u, a);
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
finish: finish: