From: =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau <frederic.dalleau@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH v2 1/2] voicecall: manage multiparty list in AT+CHLD=3
Date: Tue, 05 Jul 2011 07:50:36 +0200 [thread overview]
Message-ID: <1309845037-27360-2-git-send-email-frederic.dalleau@linux.intel.com> (raw)
In-Reply-To: <1309845037-27360-1-git-send-email-frederic.dalleau@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 2987 bytes --]
---
src/voicecall.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index 9620838..14f25ab 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1788,7 +1788,7 @@ static DBusMessage *multiparty_private_chat(DBusConnection *conn,
unsigned int id;
GSList *l;
- if (vc->pending)
+ if (vc->pending || vc->pending_em)
return __ofono_error_busy(msg);
if (dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &callpath,
@@ -1886,7 +1886,7 @@ static DBusMessage *multiparty_create(DBusConnection *conn,
{
struct ofono_voicecall *vc = data;
- if (vc->pending)
+ if (vc->pending || vc->pending_em)
return __ofono_error_busy(msg);
if (!voicecalls_have_held(vc) || !voicecalls_have_active(vc))
@@ -1907,7 +1907,7 @@ static DBusMessage *multiparty_hangup(DBusConnection *conn,
{
struct ofono_voicecall *vc = data;
- if (vc->pending || vc->release_list)
+ if (vc->pending || vc->pending_em || vc->release_list)
return __ofono_error_busy(msg);
if (vc->driver->release_specific == NULL)
@@ -2710,6 +2710,44 @@ static void emulator_generic_cb(const struct ofono_error *error, void *data)
ofono_emulator_send_final(em, error);
}
+static void emulator_mpty_join_cb(const struct ofono_error *error, void *data)
+{
+ struct ofono_voicecall *vc = data;
+ GSList *old;
+
+ ofono_emulator_send_final(vc->pending_em, error);
+ vc->pending_em = NULL;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+ return;
+
+ /*
+ * We just created a multiparty call, gather all held
+ * active calls and add them to the multiparty list
+ */
+ old = vc->multiparty_list;
+ vc->multiparty_list = 0;
+
+ vc->multiparty_list = g_slist_concat(vc->multiparty_list,
+ voicecalls_held_list(vc));
+
+ vc->multiparty_list = g_slist_concat(vc->multiparty_list,
+ voicecalls_active_list(vc));
+
+ vc->multiparty_list = g_slist_sort(vc->multiparty_list,
+ call_compare);
+
+ if (g_slist_length(vc->multiparty_list) < 2) {
+ ofono_error("Created multiparty call, but size is less than 2"
+ " panic!");
+ g_slist_free(old);
+ return;
+ }
+
+ voicecalls_multiparty_changed(old, vc->multiparty_list);
+ g_slist_free(old);
+}
+
static void emulator_ata_cb(struct ofono_emulator *em,
struct ofono_emulator_request *req, void *userdata)
{
@@ -2903,8 +2941,17 @@ static void emulator_chld_cb(struct ofono_emulator *em,
if (vc->driver->create_multiparty == NULL)
goto fail;
+ if (vc->pending_em || vc->pending || vc->dial_req)
+ goto fail;
+
+ if (!voicecalls_have_held(vc)
+ || !voicecalls_have_active(vc))
+ goto fail;
+
+ vc->pending_em = em;
+
vc->driver->create_multiparty(vc,
- emulator_generic_cb, em);
+ emulator_mpty_join_cb, vc);
return;
case 4:
if (vc->driver->transfer == NULL)
--
1.7.1
next prev parent reply other threads:[~2011-07-05 5:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 5:50 [PATCH v2 0/2] Manage multiparty list in emulator CHLD calls =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau
2011-07-05 5:50 ` =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau [this message]
2011-07-05 5:50 ` [PATCH v2 2/2] voicecall: manage multiparty list in AT+CHLD=2X =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau
2011-07-15 1:00 ` [PATCH v2 0/2] Manage multiparty list in emulator CHLD calls Denis Kenzior
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=1309845037-27360-2-git-send-email-frederic.dalleau@linux.intel.com \
--to=frederic.dalleau@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox