From: =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis <frederic.danis@linux.intel.com>
To: ofono@ofono.org
Subject: [RFC v5 08/12] bluetooth: Add AT+VGS support
Date: Thu, 26 Apr 2012 16:27:00 +0200 [thread overview]
Message-ID: <1335450424-19964-9-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1335450424-19964-1-git-send-email-frederic.danis@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 3380 bytes --]
---
plugins/bluetooth.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 07a73b3..65d7954 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -83,6 +83,8 @@ struct bt_audio {
guint watch;
int mic_gain;
int mic_pending;
+ int sp_gain;
+ int sp_pending;
};
void bluetooth_create_path(const char *dev_addr, const char *adapter_addr,
@@ -316,6 +318,37 @@ fail:
};
}
+static void emulator_vgs_cb(struct ofono_emulator *em,
+ struct ofono_emulator_request *req, void *userdata)
+{
+ struct bt_audio *audio = userdata;
+ struct ofono_error result;
+ int val;
+
+ switch (ofono_emulator_request_get_type(req)) {
+ case OFONO_EMULATOR_REQUEST_TYPE_SET:
+ if (!ofono_emulator_request_next_number(req, &val))
+ goto fail;
+
+ if (val < 0 && val > 15)
+ goto fail;
+
+ if (audio->sp_pending != -1)
+ ofono_error("Receiving AT+VGS while processing one");
+
+ audio->sp_pending = val;
+ audio_transport_set_property(audio, "SpeakerGain",
+ DBUS_TYPE_UINT16, &val);
+ break;
+
+ default:
+fail:
+ result.error = 0;
+ result.type = OFONO_ERROR_TYPE_FAILURE;
+ ofono_emulator_send_final(em, &result);
+ };
+}
+
static gboolean audio_property_changed(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
@@ -386,6 +419,41 @@ static gboolean audio_property_changed(DBusConnection *connection,
} else if (audio->mic_pending == value)
audio->mic_pending = -1;
audio->mic_gain = value;
+ } else if (g_str_equal(property, "SpeakerGain") == TRUE) {
+ DBusMessageIter variant;
+ int value;
+
+ if (!(audio->r_features & HFP_HF_FEATURE_REMOTE_VOLUME_CONTROL))
+ return TRUE;
+
+ if (!dbus_message_iter_next(&iter))
+ return TRUE;
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+ return TRUE;
+
+ dbus_message_iter_recurse(&iter, &variant);
+
+ if (dbus_message_iter_get_arg_type(&variant) !=
+ DBUS_TYPE_UINT16)
+ return TRUE;
+
+ dbus_message_iter_get_basic(&variant, &value);
+
+ /* Send unsolicited +VGS only if :
+ * - the value has changed
+ * - and this is not a side effect of AT+VGS
+ * But, if we receive a value change while waiting for another
+ * pending change, we may have to send +VGS for other changes
+ * (multiple AT+VGS received) to keep speaker gain in sync
+ */
+ if (audio->sp_pending != value && audio->sp_gain != value) {
+ sprintf(buf, "+VGS: %d", value);
+ ofono_emulator_send_unsolicited(audio->em, buf);
+ audio->sp_pending = -1;
+ } else if (audio->sp_pending == value)
+ audio->sp_pending = -1;
+ audio->sp_gain = value;
}
return TRUE;
@@ -419,9 +487,11 @@ struct bt_audio *bluetooth_set_audio_management(void *em, const char *path,
audio->path = g_strdup(path);
audio->r_features = features;
audio->mic_pending = -1;
+ audio->sp_pending = -1;
ofono_emulator_add_handler(em, "+NREC", emulator_nrec_cb, audio, NULL);
ofono_emulator_add_handler(em, "+VGM", emulator_vgm_cb, audio, NULL);
+ ofono_emulator_add_handler(em, "+VGS", emulator_vgs_cb, audio, NULL);
audio->watch = g_dbus_add_signal_watch(connection, NULL, path,
BLUEZ_TRANSPORT_INTERFACE,
--
1.7.1
next prev parent reply other threads:[~2012-04-26 14:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-26 14:26 [RFC v5 00/12] org.bluez.Telephony interface integration =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 01/12] bluetooth: Add org.bluez.Telephony helpers =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 02/12] hfp_hf: Update to org.bluez.Telephony interface =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 03/12] hfp_ag: " =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 04/12] bluetooth: Add audio APIs for HFP AG =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 05/12] bluetooth: Add AT+NREC support =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 06/12] bluetooth: Add +BSIR support =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:26 ` [RFC v5 07/12] bluetooth: Add AT+VGM support =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:27 ` =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis [this message]
2012-04-26 14:27 ` [RFC v5 09/12] include: add set/get data APIs to emulator =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:27 ` [RFC v5 10/12] emulator: add set/get data APIs =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:27 ` [RFC v5 11/12] hfp_ag: Add media transport support =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2012-04-26 14:27 ` [RFC v5 12/12] emulator: Update supported features =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
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=1335450424-19964-9-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=ofono@ofono.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.