[farsight2/master] Remove useless id property on the FsStream

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:20:00 PST 2008


---
 gst-libs/gst/farsight/fs-stream.c   |   16 ----------------
 gst/fsrtpconference/fs-rtp-stream.c |   12 +-----------
 2 files changed, 1 insertions(+), 27 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index bc8c6a2..1dffb1e 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -65,7 +65,6 @@ enum
 enum
 {
   PROP_0,
-  PROP_ID,
 #if 0
   /* TODO Do we really need this? */
   PROP_SOURCE_PADS,
@@ -158,21 +157,6 @@ fs_stream_class_init (FsStreamClass *klass)
   gobject_class->set_property = fs_stream_set_property;
   gobject_class->get_property = fs_stream_get_property;
 
-  /**
-   * FsStream:id:
-   *
-   * The ID of the stream, the second number of the pads linked to this stream
-   * will be this id
-   *
-   */
-  g_object_class_install_property (gobject_class,
-      PROP_ID,
-      g_param_spec_uint ("id",
-        "The ID of the stream",
-        "This ID is used on pad related to this stream",
-        0, G_MAXUINT, 0,
-        G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-
 #if 0
   /**
    * FsStream:source-pads:
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index 6a9a110..13ffb21 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -47,7 +47,6 @@ enum
 enum
 {
   PROP_0,
-  PROP_ID,
 #if 0
   /* TODO Do we really need this? */
   PROP_SOURCE_PADS,
@@ -68,7 +67,7 @@ struct _FsRtpStreamPrivate
 
   FsStreamDirection direction;
 
-  guint ssrc;
+  guint id;
 
   GList *remote_codecs;
 
@@ -176,9 +175,6 @@ fs_rtp_stream_class_init (FsRtpStreamClass *klass)
   stream_class->remote_candidates_added = fs_rtp_stream_remote_candidates_added;
   stream_class->select_candidate_pair = fs_rtp_stream_select_candidate_pair;
 
-  g_object_class_override_property (gobject_class,
-                                    PROP_ID,
-                                    "id");
 #if 0
   g_object_class_override_property (gobject_class,
                                     PROP_SOURCE_PADS,
@@ -271,9 +267,6 @@ fs_rtp_stream_get_property (GObject *object,
   FsRtpStream *self = FS_RTP_STREAM (object);
 
   switch (prop_id) {
-    case PROP_ID:
-      g_value_set_uint (value, self->priv->ssrc);
-      break;
     case PROP_REMOTE_CODECS:
       g_value_set_boxed (value, self->priv->remote_codecs);
       break;
@@ -305,9 +298,6 @@ fs_rtp_stream_set_property (GObject *object,
   FsRtpStream *self = FS_RTP_STREAM (object);
 
   switch (prop_id) {
-    case PROP_ID:
-      self->priv->ssrc = g_value_get_uint (value);
-      break;
     case PROP_SESSION:
       self->priv->session = FS_RTP_SESSION (g_value_get_object (value));
       break;
-- 
1.5.6.5




More information about the farsight-commits mailing list