1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-07-07 09:29:30 +00:00

sip: call: rename setup local/remote connection functions

Avoid ambiguity by renaming the functions. `setup_local_media ()`
could give the impression that we're setting up media codecs which
is not the case.
This commit is contained in:
Evangelos Ribeiro Tzaras 2021-04-08 14:16:35 +02:00 committed by Guido Gunther
parent 157dc1fffb
commit 4eb07148cc
3 changed files with 27 additions and 27 deletions

View file

@ -106,7 +106,7 @@ calls_sip_call_answer (CallsCall *call)
} }
/* TODO get free port by creating GSocket and passing that to the pipeline */ /* TODO get free port by creating GSocket and passing that to the pipeline */
calls_sip_call_setup_local_media (self, local_port, local_port + 1); calls_sip_call_setup_local_media_connection (self, local_port, local_port + 1);
local_sdp = calls_sip_media_manager_static_capabilities (self->manager, local_sdp = calls_sip_media_manager_static_capabilities (self->manager,
local_port, local_port,
@ -258,9 +258,9 @@ calls_sip_call_init (CallsSipCall *self)
void void
calls_sip_call_setup_local_media (CallsSipCall *self, calls_sip_call_setup_local_media_connection (CallsSipCall *self,
guint port_rtp, guint port_rtp,
guint port_rtcp) guint port_rtcp)
{ {
g_return_if_fail (CALLS_IS_SIP_CALL (self)); g_return_if_fail (CALLS_IS_SIP_CALL (self));
g_return_if_fail (CALLS_IS_SIP_MEDIA_PIPELINE (self->pipeline)); g_return_if_fail (CALLS_IS_SIP_MEDIA_PIPELINE (self->pipeline));
@ -274,10 +274,10 @@ calls_sip_call_setup_local_media (CallsSipCall *self,
void void
calls_sip_call_setup_remote_media (CallsSipCall *self, calls_sip_call_setup_remote_media_connection (CallsSipCall *self,
const char *remote, const char *remote,
guint port_rtp, guint port_rtp,
guint port_rtcp) guint port_rtcp)
{ {
g_return_if_fail (CALLS_IS_SIP_CALL (self)); g_return_if_fail (CALLS_IS_SIP_CALL (self));
g_return_if_fail (CALLS_IS_SIP_MEDIA_PIPELINE (self->pipeline)); g_return_if_fail (CALLS_IS_SIP_MEDIA_PIPELINE (self->pipeline));

View file

@ -35,19 +35,19 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (CallsSipCall, calls_sip_call, CALLS, SIP_CALL, CallsCall) G_DECLARE_FINAL_TYPE (CallsSipCall, calls_sip_call, CALLS, SIP_CALL, CallsCall)
CallsSipCall *calls_sip_call_new (const gchar *number, CallsSipCall *calls_sip_call_new (const gchar *number,
gboolean inbound, gboolean inbound,
nua_handle_t *handle); nua_handle_t *handle);
void calls_sip_call_setup_remote_media (CallsSipCall *self, void calls_sip_call_setup_remote_media_connection (CallsSipCall *self,
const char *remote, const char *remote,
guint port_rtp, guint port_rtp,
guint port_rtcp); guint port_rtcp);
void calls_sip_call_setup_local_media (CallsSipCall *self, void calls_sip_call_setup_local_media_connection (CallsSipCall *self,
guint port_rtp, guint port_rtp,
guint port_rtcp); guint port_rtcp);
void calls_sip_call_activate_media (CallsSipCall *self, void calls_sip_call_activate_media (CallsSipCall *self,
gboolean enabled); gboolean enabled);
void calls_sip_call_set_state (CallsSipCall *self, void calls_sip_call_set_state (CallsSipCall *self,
CallsCallState state); CallsCallState state);
G_END_DECLS G_END_DECLS

View file

@ -247,10 +247,10 @@ sip_i_state (int status,
* also: rtcp port = rtp port + 1 * also: rtcp port = rtp port + 1
*/ */
if (r_sdp) { if (r_sdp) {
calls_sip_call_setup_remote_media (call, calls_sip_call_setup_remote_media_connection (call,
r_sdp->sdp_connection->c_address, r_sdp->sdp_connection->c_address,
r_sdp->sdp_media->m_port, r_sdp->sdp_media->m_port,
r_sdp->sdp_media->m_port + 1); r_sdp->sdp_media->m_port + 1);
} }
/* TODO use CallCallStates with g_object_set (notify!) */ /* TODO use CallCallStates with g_object_set (notify!) */
@ -726,7 +726,7 @@ add_call (CallsSipOrigin *self,
self); self);
if (!inbound) { if (!inbound) {
calls_sip_call_setup_local_media (sip_call, local_port, local_port + 1); calls_sip_call_setup_local_media_connection (sip_call, local_port, local_port + 1);
local_sdp = calls_sip_media_manager_static_capabilities (self->media_manager, local_sdp = calls_sip_media_manager_static_capabilities (self->media_manager,
local_port, local_port,