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

call: Move state property into base class

Browse Source 
This let's us get rid of a lot of duplication in the derived classes.

Additionally we set the initial state to CALLS_CALL_STATE_INCOMING if
inbound is TRUE and CALLS_CALL_STATE_DIALING otherwise.
This commit is contained in:
Evangelos Ribeiro Tzaras
2021-12-10 09:02:39 +01:00
parent ddf1dd7349
commit a048b4c83d
10 changed files with 100 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/calls-call.c
View File

@@ -67,6 +67,7 @@ static GParamSpec *properties[N_PROPS];
static guint signals[N_SIGNALS];
typedef struct {
CallsCallState state;
gboolean inbound;
gboolean silenced;
} CallsCallPrivate;
@@ -86,12 +87,6 @@ calls_call_real_get_name (CallsCall *self)
return NULL;
}
static CallsCallState
calls_call_real_get_state (CallsCall *self)
{
return 0;
}
static const char *
calls_call_real_get_protocol (CallsCall *self)
{
@@ -127,6 +122,14 @@ calls_call_set_property (GObject *object,
switch (prop_id) {
case PROP_INBOUND:
priv->inbound = g_value_get_boolean (value);
if (priv->inbound)
calls_call_set_state (self, CALLS_CALL_STATE_INCOMING);
else
calls_call_set_state (self, CALLS_CALL_STATE_DIALING);
break;
case PROP_STATE:
calls_call_set_state (self, g_value_get_enum (value));
break;
default:
@@ -183,7 +186,6 @@ calls_call_class_init (CallsCallClass *klass)
klass->get_id = calls_call_real_get_id;
klass->get_name = calls_call_real_get_name;
klass->get_state = calls_call_real_get_state;
klass->get_protocol = calls_call_real_get_protocol;
klass->answer = calls_call_real_answer;
klass->hang_up = calls_call_real_hang_up;
@@ -216,7 +218,9 @@ calls_call_class_init (CallsCallClass *klass)
"The current state of the call",
CALLS_TYPE_CALL_STATE,
CALLS_CALL_STATE_UNKNOWN,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_READWRITE |
G_PARAM_EXPLICIT_NOTIFY |
G_PARAM_STATIC_STRINGS);
properties[PROP_PROTOCOL] =
g_param_spec_string ("protocol",
@@ -303,9 +307,42 @@ calls_call_get_name (CallsCall *self)
CallsCallState
calls_call_get_state (CallsCall *self)
{
CallsCallPrivate *priv = calls_call_get_instance_private (self);
g_return_val_if_fail (CALLS_IS_CALL (self), 0);
return CALLS_CALL_GET_CLASS (self)->get_state (self);
return priv->state;
}
/**
* calls_call_set_state:
* @self: a #CallsCall
* @state: a #CallsCallState
*
* Set the current state of the call.
*/
void
calls_call_set_state (CallsCall *self,
CallsCallState state)
{
CallsCallPrivate *priv = calls_call_get_instance_private (self);
CallsCallState old_state;
g_return_if_fail (CALLS_IS_CALL (self));
old_state = priv->state;
if (old_state == state) {
return;
}
priv->state = state;
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_STATE]);
g_signal_emit_by_name (CALLS_CALL (self),
"state-changed",
state,
old_state);
}
/**

29
src/calls-call.h
View File

@@ -53,7 +53,6 @@ struct _CallsCallClass
const char *(*get_id) (CallsCall *self);
const char *(*get_name) (CallsCall *self);
CallsCallState (*get_state) (CallsCall *self);
const char *(*get_protocol) (CallsCall *self);
void (*answer) (CallsCall *self);
void (*hang_up) (CallsCall *self);
@@ -61,19 +60,21 @@ struct _CallsCallClass
char key);
};
const char *calls_call_get_id (CallsCall *self);
const char *calls_call_get_name (CallsCall *self);
CallsCallState calls_call_get_state (CallsCall *self);
gboolean calls_call_get_inbound (CallsCall *self);
const char *calls_call_get_protocol (CallsCall *self);
void calls_call_answer (CallsCall *self);
void calls_call_hang_up (CallsCall *self);
gboolean calls_call_can_dtmf (CallsCall *self);
void calls_call_send_dtmf_tone (CallsCall *self,
char key);
CallsBestMatch *calls_call_get_contact (CallsCall *self);
void calls_call_silence_ring (CallsCall *self);
gboolean calls_call_get_silenced (CallsCall *self);
const char *calls_call_get_id (CallsCall *self);
const char *calls_call_get_name (CallsCall *self);
CallsCallState calls_call_get_state (CallsCall *self);
void calls_call_set_state (CallsCall *self,
CallsCallState state);
gboolean calls_call_get_inbound (CallsCall *self);
const char *calls_call_get_protocol (CallsCall *self);
void calls_call_answer (CallsCall *self);
void calls_call_hang_up (CallsCall *self);
gboolean calls_call_can_dtmf (CallsCall *self);
void calls_call_send_dtmf_tone (CallsCall *self,
char key);
CallsBestMatch *calls_call_get_contact (CallsCall *self);
void calls_call_silence_ring (CallsCall *self);
gboolean calls_call_get_silenced (CallsCall *self);
void calls_call_state_to_string (GString *string,
CallsCallState state);