base-call: support hanging up specific calls

E.g. we can hangup a waiting call without interfering with the active
one.
This commit is contained in:
Aleksander Morgado
2019-06-27 11:00:53 +02:00
parent 4b2f9e7d3e
commit f994982cce

View File

@@ -1030,14 +1030,13 @@ call_hangup_finish (MMBaseCall *self,
} }
static void static void
call_hangup_ready (MMBaseModem *modem, chup_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GTask *task) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_command_finish (modem, res, &error); mm_base_modem_at_command_finish (modem, res, &error);
if (error) if (error)
g_task_return_error (task, error); g_task_return_error (task, error);
else else
@@ -1045,6 +1044,43 @@ call_hangup_ready (MMBaseModem *modem,
g_object_unref (task); g_object_unref (task);
} }
static void
chup_fallback (GTask *task)
{
MMBaseCall *self;
self = g_task_get_source_object (task);
mm_base_modem_at_command (self->priv->modem,
"+CHUP",
2,
FALSE,
(GAsyncReadyCallback)chup_ready,
task);
}
static void
chld_hangup_ready (MMBaseModem *modem,
GAsyncResult *res,
GTask *task)
{
MMBaseCall *self;
GError *error = NULL;
self = g_task_get_source_object (task);
mm_base_modem_at_command_finish (modem, res, &error);
if (error) {
mm_warn ("couldn't hangup single call with call id '%u': %s",
self->priv->index, error->message);
g_error_free (error);
chup_fallback (task);
return;
}
g_task_return_boolean (task, TRUE);
g_object_unref (task);
}
static void static void
call_hangup (MMBaseCall *self, call_hangup (MMBaseCall *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
@@ -1053,12 +1089,24 @@ call_hangup (MMBaseCall *self,
GTask *task; GTask *task;
task = g_task_new (self, NULL, callback, user_data); task = g_task_new (self, NULL, callback, user_data);
/* Try to hangup the single call id */
if (self->priv->index) {
gchar *cmd;
cmd = g_strdup_printf ("+CHLD=1%u", self->priv->index);
mm_base_modem_at_command (self->priv->modem, mm_base_modem_at_command (self->priv->modem,
"+CHUP", cmd,
2, 2,
FALSE, FALSE,
(GAsyncReadyCallback)call_hangup_ready, (GAsyncReadyCallback)chld_hangup_ready,
task); task);
g_free (cmd);
return;
}
/* otherwise terminate all */
chup_fallback (task);
} }
/*****************************************************************************/ /*****************************************************************************/