summaryrefslogtreecommitdiff
path: root/transmitters/shm
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-11-20 19:52:28 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-09-07 17:09:38 +0300
commit3d3f7d093c4450923ca429367bee39bd822d1ee7 (patch)
tree2fa2ad74997eed88c9d0f2d84f8ede66760d33e8 /transmitters/shm
parent405175be1ccb24440d018e374d2c933b7a5d607f (diff)
downloadfarstream-3d3f7d093c4450923ca429367bee39bd822d1ee7.tar.gz
shm: Replace base_ip with username
Diffstat (limited to 'transmitters/shm')
-rw-r--r--transmitters/shm/fs-shm-stream-transmitter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index 3a15f4ef..cc350a19 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -368,20 +368,20 @@ fs_shm_stream_transmitter_add_remote_candidate (
if (!fs_shm_stream_transmitter_add_sink (self, candidate, error))
return FALSE;
- if (candidate->base_ip)
+ if (candidate->username)
{
if (self->priv->shm_src[candidate->component_id])
{
if (fs_shm_transmitter_check_shm_src (self->priv->transmitter,
- self->priv->shm_src[candidate->component_id], candidate->base_ip))
+ self->priv->shm_src[candidate->component_id], candidate->username))
return TRUE;
self->priv->shm_src[candidate->component_id] = NULL;
}
self->priv->shm_src[candidate->component_id] =
fs_shm_transmitter_get_shm_src (self->priv->transmitter,
- candidate->component_id, candidate->base_ip, got_buffer_func, self,
+ candidate->component_id, candidate->username, got_buffer_func, self,
error);
if (self->priv->shm_src[candidate->component_id] == NULL)
@@ -416,11 +416,11 @@ fs_shm_stream_transmitter_set_remote_candidates (
return FALSE;
}
- if (!candidate->ip && !candidate->base_ip)
+ if (!candidate->ip && !candidate->username)
{
g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS,
"The candidate does not have a SINK shm segment in its ip"
- " or a SRC shm segment in its base_ip");
+ " or a SRC shm segment in its username");
return FALSE;
}
}