Let calls-call be an abstract class

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

View File

@@ -37,25 +37,16 @@ struct _CallsDummyCall
CallsCallState state;
};
static void calls_dummy_call_message_source_interface_init (CallsCallInterface *iface);
static void calls_dummy_call_call_interface_init (CallsCallInterface *iface);
static void calls_dummy_call_message_source_interface_init (CallsMessageSourceInterface *iface);
G_DEFINE_TYPE_WITH_CODE (CallsDummyCall, calls_dummy_call, G_TYPE_OBJECT,
G_DEFINE_TYPE_WITH_CODE (CallsDummyCall, calls_dummy_call, CALLS_TYPE_CALL,
G_IMPLEMENT_INTERFACE (CALLS_TYPE_MESSAGE_SOURCE,
calls_dummy_call_message_source_interface_init)
G_IMPLEMENT_INTERFACE (CALLS_TYPE_CALL,
calls_dummy_call_call_interface_init))
calls_dummy_call_message_source_interface_init))
enum {
PROP_0,
PROP_NUMBER_CONSTRUCTOR,
PROP_INBOUND_CONSTRUCTOR,
PROP_CALL_NUMBER,
PROP_CALL_INBOUND,
PROP_CALL_STATE,
PROP_CALL_NAME,
PROP_LAST_PROP
};
static GParamSpec *props[PROP_LAST_PROP];
@@ -73,15 +64,39 @@ change_state (CallsCall *call,
}
self->state = state;
g_object_notify_by_pspec (G_OBJECT (call), props[PROP_CALL_STATE]);
g_object_notify (G_OBJECT (self), "state");
g_signal_emit_by_name (call,
"state-changed",
state,
old_state);
}
static const char *
calls_dummy_call_get_number (CallsCall *call)
{
CallsDummyCall *self = CALLS_DUMMY_CALL (call);
return self->number;
}
static CallsCallState
calls_dummy_call_get_state (CallsCall *call)
{
CallsDummyCall *self = CALLS_DUMMY_CALL (call);
return self->state;
}
static gboolean
calls_dummy_call_get_inbound (CallsCall *call)
{
CallsDummyCall *self = CALLS_DUMMY_CALL (call);
return self->inbound;
}
static void
answer (CallsCall *call)
calls_dummy_call_answer (CallsCall *call)
{
CallsDummyCall *self;
@@ -94,7 +109,7 @@ answer (CallsCall *call)
}
static void
hang_up (CallsCall *call)
calls_dummy_call_hang_up (CallsCall *call)
{
CallsDummyCall *self;
@@ -104,19 +119,6 @@ hang_up (CallsCall *call)
change_state (call, self, CALLS_CALL_STATE_DISCONNECTED);
}
static void
tone_start (CallsCall *call, gchar key)
{
g_info ("Beep! (%c)", (int)key);
}
static void
tone_stop (CallsCall *call, gchar key)
{
g_info ("Beep end (%c)", (int)key);
}
static gboolean
outbound_timeout_cb (CallsDummyCall *self)
{
@@ -197,39 +199,6 @@ constructed (GObject *object)
G_OBJECT_CLASS (calls_dummy_call_parent_class)->constructed (object);
}
static void
get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
CallsDummyCall *self = CALLS_DUMMY_CALL (object);
switch (property_id) {
case PROP_CALL_INBOUND:
g_value_set_boolean (value, self->inbound);
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;
case PROP_CALL_NAME:
g_value_set_string (value, NULL);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
finalize (GObject *object)
{
@@ -245,12 +214,18 @@ static void
calls_dummy_call_class_init (CallsDummyCallClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
CallsCallClass *call_class = CALLS_CALL_CLASS (klass);
object_class->get_property = get_property;
object_class->set_property = set_property;
object_class->constructed = constructed;
object_class->finalize = finalize;
call_class->get_number = calls_dummy_call_get_number;
call_class->get_state = calls_dummy_call_get_state;
call_class->get_inbound = calls_dummy_call_get_inbound;
call_class->answer = calls_dummy_call_answer;
call_class->hang_up = calls_dummy_call_hang_up;
props[PROP_NUMBER_CONSTRUCTOR] =
g_param_spec_string ("number-constructor",
"Number (constructor)",
@@ -266,32 +241,10 @@ calls_dummy_call_class_init (CallsDummyCallClass *klass)
FALSE,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_INBOUND_CONSTRUCTOR, props[PROP_INBOUND_CONSTRUCTOR]);
#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
}
static void
calls_dummy_call_call_interface_init (CallsCallInterface *iface)
{
iface->answer = answer;
iface->hang_up = hang_up;
iface->tone_start = tone_start;
iface->tone_stop = tone_stop;
}
static void
calls_dummy_call_message_source_interface_init (CallsCallInterface *iface)
calls_dummy_call_message_source_interface_init (CallsMessageSourceInterface *iface)
{
}

View File

@@ -27,11 +27,13 @@
#include <glib-object.h>
#include "calls-call.h"
G_BEGIN_DECLS
#define CALLS_TYPE_DUMMY_CALL (calls_dummy_call_get_type ())
G_DECLARE_FINAL_TYPE (CallsDummyCall, calls_dummy_call, CALLS, DUMMY_CALL, GObject);
G_DECLARE_FINAL_TYPE (CallsDummyCall, calls_dummy_call, CALLS, DUMMY_CALL, CallsCall)
CallsDummyCall *calls_dummy_call_new (const gchar *number,
gboolean inbound);