kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let calls-call be an abstract class

Browse Source 
And adapt to changes.

A calls-mm-call IS-A calls-call (and so on)
This commit is contained in:
Mohammed Sadiq
2021-04-05 09:30:10 +05:30
parent a30e1eaa8f
commit c30a41ffa9
10 changed files with 422 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
plugins/ofono/calls-ofono-call.c
View File

@@ -44,25 +44,16 @@ struct _CallsOfonoCall
gboolean inbound;
};
static void calls_ofono_call_message_source_interface_init (CallsCallInterface *iface);
static void calls_ofono_call_call_interface_init (CallsCallInterface *iface);
static void calls_ofono_call_message_source_interface_init (CallsMessageSourceInterface *iface);
G_DEFINE_TYPE_WITH_CODE (CallsOfonoCall, calls_ofono_call, G_TYPE_OBJECT,
G_DEFINE_TYPE_WITH_CODE (CallsOfonoCall, calls_ofono_call, CALLS_TYPE_CALL,
G_IMPLEMENT_INTERFACE (CALLS_TYPE_MESSAGE_SOURCE,
calls_ofono_call_message_source_interface_init)
G_IMPLEMENT_INTERFACE (CALLS_TYPE_CALL,
calls_ofono_call_call_interface_init))
calls_ofono_call_message_source_interface_init))
enum {
PROP_0,
PROP_VOICE_CALL,
PROP_PROPERTIES,
PROP_CALL_NUMBER,
PROP_CALL_INBOUND,
PROP_CALL_STATE,
PROP_CALL_NAME,
PROP_LAST_PROP,
};
static GParamSpec *props[PROP_LAST_PROP];
@@ -85,13 +76,44 @@ change_state (CallsOfonoCall *self,
}
self->state = state;
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_CALL_STATE]);
g_object_notify (G_OBJECT (self), "state");
g_signal_emit_by_name (CALLS_CALL (self),
"state-changed",
state,
old_state);
}
static const char *
calls_ofono_call_get_number (CallsCall *call)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
return self->number;
}
static const char *
calls_ofono_call_get_name (CallsCall *call)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
return self->name;
}
static CallsCallState
calls_ofono_call_get_state (CallsCall *call)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
return self->state;
}
static gboolean
calls_ofono_call_get_inbound (CallsCall *call)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
return self->state;
}
struct CallsCallOperationData
{
@@ -122,7 +144,7 @@ operation_cb (GDBOVoiceCall *voice_call,
static void
answer (CallsCall *call)
calls_ofono_call_answer (CallsCall *call)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
struct CallsCallOperationData *data;
@@ -140,7 +162,7 @@ answer (CallsCall *call)
static void
hang_up (CallsCall *call)
calls_ofono_call_hang_up (CallsCall *call)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
struct CallsCallOperationData *data;
@@ -158,7 +180,7 @@ hang_up (CallsCall *call)
static void
tone_start (CallsCall *call, gchar key)
calls_ofono_call_tone_start (CallsCall *call, gchar key)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (call);
if (self->state != CALLS_CALL_STATE_ACTIVE)
@@ -218,37 +240,6 @@ set_property (GObject *object,
}
}
static void
get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
CallsOfonoCall *self = CALLS_OFONO_CALL (object);
switch (property_id) {
case PROP_CALL_INBOUND:
g_value_set_boolean (value, self->state);
break;
case PROP_CALL_NAME:
g_value_set_string(value, self->name);
break;
case PROP_CALL_NUMBER:
g_value_set_string(value, self->number);
break;
case PROP_CALL_STATE:
g_value_set_enum (value, self->state);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
property_changed_cb (CallsOfonoCall *self,
const gchar *name,
@@ -349,14 +340,22 @@ static void
calls_ofono_call_class_init (CallsOfonoCallClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
CallsCallClass *call_class = CALLS_CALL_CLASS (klass);
GType tone_arg_types = G_TYPE_CHAR;
object_class->set_property = set_property;
object_class->get_property = get_property;
object_class->constructed = constructed;
object_class->dispose = dispose;
object_class->finalize = finalize;
call_class->get_number = calls_ofono_call_get_number;
call_class->get_name = calls_ofono_call_get_name;
call_class->get_state = calls_ofono_call_get_state;
call_class->get_inbound = calls_ofono_call_get_inbound;
call_class->answer = calls_ofono_call_answer;
call_class->hang_up = calls_ofono_call_hang_up;
call_class->tone_start = calls_ofono_call_tone_start;
props[PROP_VOICE_CALL] =
g_param_spec_object ("voice-call",
"Voice call",
@@ -374,17 +373,6 @@ calls_ofono_call_class_init (CallsOfonoCallClass *klass)
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_PROPERTIES, props[PROP_PROPERTIES]);
#define IMPLEMENTS(ID, NAME) \
g_object_class_override_property (object_class, ID, NAME); \
props[ID] = g_object_class_find_property(object_class, NAME);
IMPLEMENTS(PROP_CALL_NUMBER, "number");
IMPLEMENTS(PROP_CALL_INBOUND, "inbound");
IMPLEMENTS(PROP_CALL_STATE, "state");
IMPLEMENTS(PROP_CALL_NAME, "name");
#undef IMPLEMENTS
signals[SIGNAL_TONE] =
g_signal_newv ("tone",
G_TYPE_FROM_CLASS (klass),
@@ -396,20 +384,10 @@ calls_ofono_call_class_init (CallsOfonoCallClass *klass)
static void
calls_ofono_call_message_source_interface_init (CallsCallInterface *iface)
calls_ofono_call_message_source_interface_init (CallsMessageSourceInterface *iface)
{
}
static void
calls_ofono_call_call_interface_init (CallsCallInterface *iface)
{
iface->answer = answer;
iface->hang_up = hang_up;
iface->tone_start = tone_start;
}
static void
calls_ofono_call_init (CallsOfonoCall *self)
{

5
plugins/ofono/calls-ofono-call.h
View File

@@ -26,14 +26,15 @@
#define CALLS_OFONO_CALL_H__
#include <libgdbofono/gdbo-call.h>
#include <glib-object.h>
#include "calls-call.h"
G_BEGIN_DECLS
#define CALLS_TYPE_OFONO_CALL (calls_ofono_call_get_type ())
G_DECLARE_FINAL_TYPE (CallsOfonoCall, calls_ofono_call, CALLS, OFONO_CALL, GObject);
G_DECLARE_FINAL_TYPE (CallsOfonoCall, calls_ofono_call, CALLS, OFONO_CALL, CallsCall)
CallsOfonoCall *calls_ofono_call_new (GDBOVoiceCall *voice_call,
GVariant *properties);