summaryrefslogtreecommitdiff
path: root/farstream/fs-conference.c
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-01-27 16:50:08 +0100
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-07-31 16:08:54 +0200
commited911efc60de1538c4e24ca01f376e25c09a4124 (patch)
tree45412690737447ab5ec60c2d713fd264274ced55 /farstream/fs-conference.c
parentfb74f736e23844bbf289011f9bff7ad91581af18 (diff)
downloadfarstream-ed911efc60de1538c4e24ca01f376e25c09a4124.tar.gz
Port to GStreamer 0.11
Diffstat (limited to 'farstream/fs-conference.c')
-rw-r--r--farstream/fs-conference.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/farstream/fs-conference.c b/farstream/fs-conference.c
index 160c69cf..58edb776 100644
--- a/farstream/fs-conference.c
+++ b/farstream/fs-conference.c
@@ -62,9 +62,7 @@ GST_DEBUG_CATEGORY (fs_conference_debug);
#define GST_CAT_DEFAULT fs_conference_debug
-GST_BOILERPLATE (
- FsConference, fs_conference,
- GstBin, GST_TYPE_BIN)
+G_DEFINE_ABSTRACT_TYPE (FsConference, fs_conference,GST_TYPE_BIN)
GQuark
@@ -81,22 +79,15 @@ _fs_conference_init_debug (void)
}
static void
-fs_conference_base_init (gpointer g_class)
-{
- _fs_conference_init_debug ();
-}
-
-
-
-static void
fs_conference_class_init (FsConferenceClass * klass)
{
+ _fs_conference_init_debug ();
}
static void
-fs_conference_init (FsConference *conf, FsConferenceClass *bclass)
+fs_conference_init (FsConference *conf)
{
- GST_DEBUG ("fs_conference_init");
+ GST_DEBUG_OBJECT (conf, "fs_conference_init");
}