korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-29 07:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

control: Fix Control.Disconnect not generating any reply

Browse Source 
avctp_disconnect does disconnect immediatelly so there is no time to
set the pending message.
This commit is contained in:
Luiz Augusto von Dentz 2012-10-25 16:59:04 +03:00 committed by Johan Hedberg
parent 79b5c838af
commit 0a61f4686a
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
audio/control.c
View File

@ -65,7 +65,6 @@ struct control {
struct avctp *session;
gboolean target;
DBusMessage *connect;
DBusMessage *disconnect;
};
static void state_changed(struct audio_device *dev, avctp_state_t old_state,
@ -88,13 +87,6 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state,
control->connect = NULL;
}
if (control->disconnect) {
g_dbus_send_reply(conn, control->disconnect,
DBUS_TYPE_INVALID);
dbus_message_unref(control->disconnect);
control->disconnect = NULL;
}
if (old_state != AVCTP_STATE_CONNECTED)
break;
@ -184,14 +176,9 @@ static DBusMessage *control_disconnect(DBusConnection *conn, DBusMessage *msg,
if (!control->session)
return btd_error_not_connected(msg);
if (control->disconnect)
return btd_error_in_progress(msg);
avctp_disconnect(control->session);
control->disconnect = dbus_message_ref(msg);
return NULL;
return dbus_message_new_method_return(msg);
}
static DBusMessage *key_pressed(DBusConnection *conn, DBusMessage *msg,
@ -273,7 +260,7 @@ static const GDBusMethodTable control_methods[] = {
NULL, GDBUS_ARGS({ "connected", "b" }),
control_is_connected) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, control_connect) },
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, control_disconnect) },
{ GDBUS_METHOD("Disconnect", NULL, NULL, control_disconnect) },
{ GDBUS_METHOD("Play", NULL, NULL, control_play) },
{ GDBUS_METHOD("Pause", NULL, NULL, control_pause) },
{ GDBUS_METHOD("Stop", NULL, NULL, control_stop) },
@ -309,9 +296,6 @@ static void path_unregister(void *data)
if (control->connect)
dbus_message_unref(control->connect);
if (control->disconnect)
dbus_message_unref(control->disconnect);
g_free(control);
dev->control = NULL;
}