From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ 15/16] control: Add Control.Connect API
Date: Mon, 15 Oct 2012 16:05:35 +0200 [thread overview]
Message-ID: <1350309936-31588-15-git-send-email-luiz.dentz@gmail.com> (raw)
In-Reply-To: <1350309936-31588-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This method can be used to manually connect AVRCP when acting as a
controller.
---
audio/control.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
doc/control-api.txt | 4 ++++
2 files changed, 49 insertions(+)
diff --git a/audio/control.c b/audio/control.c
index b77c4cb..e15e9ba 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -61,6 +61,7 @@ static unsigned int avctp_id = 0;
struct control {
struct avctp *session;
gboolean target;
+ DBusMessage *connect;
};
static void state_changed(struct audio_device *dev, avctp_state_t old_state,
@@ -73,6 +74,15 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state,
case AVCTP_STATE_DISCONNECTED:
control->session = NULL;
+ if (control->connect) {
+ DBusMessage *reply = btd_error_failed(control->connect,
+ "Unable to connect");
+
+ g_dbus_send_message(btd_get_dbus_connection(), reply);
+ dbus_message_unref(control->connect);
+ control->connect = NULL;
+ }
+
if (old_state != AVCTP_STATE_CONNECTED)
break;
@@ -91,6 +101,13 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state,
break;
case AVCTP_STATE_CONNECTED:
+ if (control->connect) {
+ g_dbus_send_reply(conn, control->connect,
+ DBUS_TYPE_INVALID);
+ dbus_message_unref(control->connect);
+ control->connect = NULL;
+ }
+
g_dbus_emit_signal(conn, dev->path,
AUDIO_CONTROL_INTERFACE, "Connected",
DBUS_TYPE_INVALID);
@@ -123,6 +140,30 @@ static DBusMessage *control_is_connected(DBusConnection *conn,
return reply;
}
+static DBusMessage *control_connect(DBusConnection *conn, DBusMessage *msg,
+ void *data)
+{
+ struct audio_device *device = data;
+ struct control *control = device->control;
+
+ if (control->session)
+ return btd_error_already_connected(msg);
+
+ if (!control->target)
+ return btd_error_not_supported(msg);
+
+ if (control->connect)
+ return btd_error_in_progress(msg);
+
+ control->session = avctp_connect(&device->src, &device->dst);
+ if (!control->session)
+ return btd_error_failed(msg, "Unable to connect");
+
+ control->connect = dbus_message_ref(msg);
+
+ return NULL;
+}
+
static DBusMessage *key_pressed(DBusConnection *conn, DBusMessage *msg,
uint8_t op, void *data)
{
@@ -201,6 +242,7 @@ static const GDBusMethodTable control_methods[] = {
{ GDBUS_DEPRECATED_METHOD("IsConnected",
NULL, GDBUS_ARGS({ "connected", "b" }),
control_is_connected) },
+ { GDBUS_ASYNC_METHOD("Connect", NULL, NULL, control_connect) },
{ GDBUS_METHOD("Play", NULL, NULL, control_play) },
{ GDBUS_METHOD("Pause", NULL, NULL, control_pause) },
{ GDBUS_METHOD("Stop", NULL, NULL, control_stop) },
@@ -233,6 +275,9 @@ static void path_unregister(void *data)
if (control->session)
avctp_disconnect(control->session);
+ if (control->connect)
+ dbus_message_unref(control->connect);
+
g_free(control);
dev->control = NULL;
}
diff --git a/doc/control-api.txt b/doc/control-api.txt
index 3792dfa..61069ea 100644
--- a/doc/control-api.txt
+++ b/doc/control-api.txt
@@ -21,6 +21,10 @@ Methods boolean IsConnected() {deprecated}
Returns all properties for the interface. See the
properties section for available properties.
+ void Connect()
+
+ Connect to remote device.
+
void Play()
Resume playback.
--
1.7.11.4
next prev parent reply other threads:[~2012-10-15 14:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-15 14:05 [PATCH BlueZ 01/16] AVCTP: Simplify channel handling Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 02/16] AVCTP: Allocate memory to hold incoming/outgoing PDUs Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 03/16] AVRCP: Register to AVCTP state changes without depending on player Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 04/16] AVRCP: Don't respond with errors when no player is registered Luiz Augusto von Dentz
2012-10-15 14:37 ` Johan Hedberg
2012-10-15 14:05 ` [PATCH BlueZ 05/16] AVRCP: Fix crash on disconnect Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 06/16] AVRCP: Simplify state_changed callback Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 07/16] AVCTP: Make use of allocate buffer to send data Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 08/16] AVCTP: Wait confirmation to send button release Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 09/16] AVCTP: Add proper prefix to AVC passthrough codes Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 10/16] AVCTP: Add proper queueing for channels Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 11/16] AVRCP: Fix reading wrong profile when acting as a controller Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 12/16] AVRCP: Fix handling TG PDUs as they were CT PDUs Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 13/16] AVRCP: Add proper role init procedure Luiz Augusto von Dentz
2012-10-15 14:05 ` [PATCH BlueZ 14/16] control: Add basic support for AVRCP 1.0 controller Luiz Augusto von Dentz
2012-10-15 14:05 ` Luiz Augusto von Dentz [this message]
2012-10-15 14:05 ` [PATCH BlueZ 16/16] control: Add Control.Disconnect method Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350309936-31588-15-git-send-email-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox