[farsight2/master] Have one one transmitter element for RTP and RTCP and this element will provide 2 pads

[Olivier Crête]

---
 gst-libs/gst/farsight/fs-transmitter.c |   37 +++++--------------------------
 1 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index ff0d0fc..053e48c 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -55,9 +55,7 @@ enum
 {
   PROP_0,
   PROP_GST_SINK,
-  PROP_GST_RTCP_SINK,
   PROP_GST_SRC,
-  PROP_GST_RTCP_SRC
 };
 
 struct _FsTransmitterPrivate
@@ -127,6 +125,8 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
    * FsTransmitter:gst-src:
    *
    * A network source #GstElement to be used by the #FsSession
+   * This element MUST provide a "src" pad and MAY provide a "rtcpsrc" pad
+   * to be used for RTCP. Both of these pads MUST be static pads.
    *
    */
   g_object_class_install_property (gobject_class,
@@ -138,23 +138,13 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
         G_PARAM_READABLE));
 
   /**
-   * FsTransmitter:gst-rtcp-src:
-   *
-   * A network source #GstElement to be used by the #FsSession for RTCP messages
-   *
-   */
-  g_object_class_install_property (gobject_class,
-      PROP_GST_RTCP_SRC,
-      g_param_spec_object ("gst-rtcp-src",
-        "The network source",
-        "A source GstElement to be used by a FsSession for RTCP messages",
-        GST_TYPE_ELEMENT,
-        G_PARAM_READABLE));
-
-  /**
    * FsTransmitter:gst-sink:
    *
    * A network source #GstElement to be used by the #FsSession
+   * This element MUST provide a "sink" pad and MAY provide a "rtcpsink" pad
+   * to be used for RTCP. Both of these pads MUST be static pads.
+   * This element MUST NOT block on state changes, etc and should therefore
+   * contain of a queue or something similar, or have "async=FALSE" for rtcp
    *
    */
   g_object_class_install_property (gobject_class,
@@ -166,21 +156,6 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
         G_PARAM_READABLE));
 
   /**
-   * FsTransmitter:gst-rtcp-sink:
-   *
-   * A network source #GstElement to be used by the #FsSession
-   *
-   */
-  g_object_class_install_property (gobject_class,
-      PROP_GST_RTCP_SINK,
-      g_param_spec_object ("gst-rtcp-sink",
-        "The network source",
-        "A source GstElement to be used by a FsSession",
-        GST_TYPE_ELEMENT,
-        G_PARAM_READABLE));
-
-
-  /**
    * FsTransmitter::error:
    * @self: #FsTransmitter that emitted the signal
    * @errorno: The number of the error
-- 
1.5.6.5