summaryrefslogtreecommitdiff
path: root/gst/fsrawconference
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-02-08 15:46:36 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-03-09 17:11:22 -0500
commitcec5a855a517d286c999ad700b1739915bbf3cf3 (patch)
treea7e2ec155d563cf985d8205fb300b919f3d5243f /gst/fsrawconference
parent821fb893894b9a7434d5bf2cd9ea2ebfc0a438a9 (diff)
downloadfarstream-cec5a855a517d286c999ad700b1739915bbf3cf3.tar.gz
rawsession: Correctly name remove_stream method
Diffstat (limited to 'gst/fsrawconference')
-rw-r--r--gst/fsrawconference/fs-raw-session.c6
-rw-r--r--gst/fsrawconference/fs-raw-session.h2
-rw-r--r--gst/fsrawconference/fs-raw-stream.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/gst/fsrawconference/fs-raw-session.c b/gst/fsrawconference/fs-raw-session.c
index 3c9eb86b..982ba554 100644
--- a/gst/fsrawconference/fs-raw-session.c
+++ b/gst/fsrawconference/fs-raw-session.c
@@ -323,7 +323,7 @@ fs_raw_session_dispose (GObject *object)
if (handler_id > 0 && self->priv->stream)
g_signal_handler_disconnect (self->priv->stream, handler_id);
- raw_session_remove_stream(self, FS_STREAM (self->priv->stream));
+ fs_raw_session_remove_stream(self, FS_STREAM (self->priv->stream));
}
GST_OBJECT_LOCK (conference);
@@ -909,8 +909,8 @@ error:
}
void
-raw_session_remove_stream (FsRawSession *self,
- FsStream *stream)
+fs_raw_session_remove_stream (FsRawSession *self,
+ FsStream *stream)
{
FsRawConference *conference = fs_raw_session_get_conference (self, NULL);
FsTransmitter *transmitter = NULL;
diff --git a/gst/fsrawconference/fs-raw-session.h b/gst/fsrawconference/fs-raw-session.h
index a47a2098..135104d3 100644
--- a/gst/fsrawconference/fs-raw-session.h
+++ b/gst/fsrawconference/fs-raw-session.h
@@ -83,7 +83,7 @@ FsRawSession *fs_raw_session_new (FsMediaType media_type,
guint id,
GError **error);
-void raw_session_remove_stream (FsRawSession *self,
+void fs_raw_session_remove_stream (FsRawSession *self,
FsStream *stream);
void fs_raw_session_update_direction (FsRawSession *self,
diff --git a/gst/fsrawconference/fs-raw-stream.c b/gst/fsrawconference/fs-raw-stream.c
index 40d89618..fce135a8 100644
--- a/gst/fsrawconference/fs-raw-stream.c
+++ b/gst/fsrawconference/fs-raw-stream.c
@@ -379,7 +379,7 @@ fs_raw_stream_real_dispose (FsRawStream *self)
if (self->priv->session)
{
- raw_session_remove_stream (self->priv->session, (FsStream *)self);
+ fs_raw_session_remove_stream (self->priv->session, (FsStream *)self);
g_object_unref (self->priv->session);
self->priv->session = NULL;