summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-01-10 20:33:00 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-01-10 20:33:00 (GMT)
commita606a0518e89185946013f948fedbeb5a0c1076e (patch)
treeb92df9c56147bbc9172d0b244bba523bf4813124
parenteb3505fac61c06913ecf1920cb6b4fb7e20eb474 (diff)
downloadfarstream-a606a0518e89185946013f948fedbeb5a0c1076e.tar.gz
farstream-a606a0518e89185946013f948fedbeb5a0c1076e.tar.xz
Move the FsSession's conference property to the base class
-rw-r--r--farstream/fs-session.c17
-rw-r--r--gst/fsmsnconference/fs-msn-session.c10
-rw-r--r--gst/fsrawconference/fs-raw-session.c10
-rw-r--r--gst/fsrtpconference/fs-rtp-session.c12
4 files changed, 24 insertions, 25 deletions
diff --git a/farstream/fs-session.c b/farstream/fs-session.c
index 4261d85..06481f7 100644
--- a/farstream/fs-session.c
+++ b/farstream/fs-session.c
@@ -162,6 +162,7 @@ enum
enum
{
PROP_0,
+ PROP_CONFERENCE,
PROP_MEDIA_TYPE,
PROP_ID,
PROP_SINK_PAD,
@@ -204,6 +205,22 @@ fs_session_class_init (FsSessionClass *klass)
gobject_class->set_property = fs_session_set_property;
gobject_class->get_property = fs_session_get_property;
+
+ /**
+ * FsSession:conference:
+ *
+ * The #FsConference parent of this session. This property is a
+ * construct param and is read-only.
+ *
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CONFERENCE,
+ g_param_spec_object ("conference",
+ "The FsConference",
+ "The Conference this stream refers to",
+ FS_TYPE_CONFERENCE,
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
/**
* FsSession:media-type:
*
diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index 3436b08..8d4816d 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -161,14 +161,8 @@ fs_msn_session_class_init (FsMsnSessionClass *klass)
PROP_CURRENT_SEND_CODEC, "current-send-codec");
g_object_class_override_property (gobject_class,
PROP_TOS, "tos");
-
- g_object_class_install_property (gobject_class,
- PROP_CONFERENCE,
- g_param_spec_object ("conference",
- "The Conference this stream refers to",
- "This is a convience pointer for the Conference",
- FS_TYPE_MSN_CONFERENCE,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_override_property (gobject_class,
+ PROP_CONFERENCE, "conference");
gobject_class->dispose = fs_msn_session_dispose;
gobject_class->finalize = fs_msn_session_finalize;
diff --git a/gst/fsrawconference/fs-raw-session.c b/gst/fsrawconference/fs-raw-session.c
index 0f90324..e65c0f5 100644
--- a/gst/fsrawconference/fs-raw-session.c
+++ b/gst/fsrawconference/fs-raw-session.c
@@ -217,14 +217,8 @@ fs_raw_session_class_init (FsRawSessionClass *klass)
PROP_CURRENT_SEND_CODEC, "current-send-codec");
g_object_class_override_property (gobject_class,
PROP_TOS, "tos");
-
- g_object_class_install_property (gobject_class,
- PROP_CONFERENCE,
- g_param_spec_object ("conference",
- "The Conference this stream refers to",
- "This is a convience pointer for the Conference",
- FS_TYPE_RAW_CONFERENCE,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_override_property (gobject_class,
+ PROP_CONFERENCE, "conference");
gobject_class->dispose = fs_raw_session_dispose;
gobject_class->finalize = fs_raw_session_finalize;
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 7451cbb..858a4ba 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -91,6 +91,7 @@ enum
enum
{
PROP_0,
+ PROP_CONFERENCE,
PROP_MEDIA_TYPE,
PROP_ID,
PROP_SINK_PAD,
@@ -98,7 +99,6 @@ enum
PROP_CODECS,
PROP_CODECS_WITHOUT_CONFIG,
PROP_CURRENT_SEND_CODEC,
- PROP_CONFERENCE,
PROP_NO_RTCP_TIMEOUT,
PROP_SSRC,
PROP_TOS,
@@ -348,6 +348,8 @@ fs_rtp_session_class_init (FsRtpSessionClass *klass)
session_class->codecs_need_resend = fs_rtp_session_get_codecs_need_resend;
g_object_class_override_property (gobject_class,
+ PROP_CONFERENCE, "conference");
+ g_object_class_override_property (gobject_class,
PROP_MEDIA_TYPE, "media-type");
g_object_class_override_property (gobject_class,
PROP_ID, "id");
@@ -365,14 +367,6 @@ fs_rtp_session_class_init (FsRtpSessionClass *klass)
PROP_TOS, "tos");
g_object_class_install_property (gobject_class,
- PROP_CONFERENCE,
- g_param_spec_object ("conference",
- "The Conference this stream refers to",
- "This is a convience pointer for the Conference",
- FS_TYPE_RTP_CONFERENCE,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class,
PROP_NO_RTCP_TIMEOUT,
g_param_spec_int ("no-rtcp-timeout",
"The timeout (in ms) before no RTCP is assumed",