[farsight2/master] Remove now redundant send-codec-changed signal

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


---
 gst-libs/gst/farsight/fs-session.c   |   27 +++------------------------
 gst/fsrtpconference/fs-rtp-session.c |    6 ++----
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index 1f6d21d..a23eb35 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -57,7 +57,6 @@
 enum
 {
   ERROR,
-  SEND_CODEC_CHANGED,
   NEW_NEGOTIATED_CODECS,
   LAST_SIGNAL
 };
@@ -221,11 +220,10 @@ fs_session_class_init (FsSessionClass *klass)
    *
    * Indicates the currently active send codec. A user can change the active
    * send codec by calling fs_session_set_send_codec(). The send codec could
-   * also be automatically changed by Farsight. In both cases the
-   * ::send-codec-changed signal will be emited. This property is an
+   * also be automatically changed by Farsight. This property is an
    * #FsCodec. User must free the codec using fs_codec_destroy() when done.
-   * The #FsSession::send-codec-changed signal is emitted when the content
-   * of this property changes.
+   * The #GObject::notify signal is emitted when the content of this property
+   * changes.
    *
    */
   g_object_class_install_property (gobject_class,
@@ -258,25 +256,6 @@ fs_session_class_init (FsSessionClass *klass)
       G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
-   * FsSession::send-codec-changed:
-   * @self: #FsSession that emitted the signal
-   *
-   * This signal is emitted when the active send codec has been changed
-   * manually by the user or automatically for QoS purposes. The user should
-   * look at the #FsSession:current-send-codec property in the session to
-   * determine what the new active codec is
-   *
-   */
-  signals[SEND_CODEC_CHANGED] = g_signal_new ("send-codec-changed",
-      G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      g_cclosure_marshal_VOID__VOID,
-      G_TYPE_NONE, 0);
-
-  /**
    * FsSession::new-negotiated-codecs:
    * @self: #FsSession that emitted the signal
    *
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 6f23f15..a8f0acd 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -2302,8 +2302,8 @@ fs_rtp_session_add_send_codec_bin (FsRtpSession *session,
 /**
  * _idle_emit_send_codec_changed
  *
- * This idle function is called to emit the "send-codec-changed" signal
- * on the main thread
+ * This idle function is called to emit the #GObject::notify signal for the
+ * #FsSession:current-send-codec property on the main thread
  *
  * Returns: FALSE, because the event should be removed
  */
@@ -2313,7 +2313,6 @@ _idle_emit_send_codec_changed (gpointer data)
 {
   FsRtpSession *self = FS_RTP_SESSION (data);
 
-  g_signal_emit_by_name (self, "send-codec-changed");
   g_object_notify (G_OBJECT (self), "current-send-codec");
 
   FS_RTP_SESSION_LOCK (self);
@@ -2498,7 +2497,6 @@ fs_rtp_session_verify_send_codec_bin_locked (FsRtpSession *self, GError **error)
       codec = NULL;
 
       g_object_notify (G_OBJECT (self), "current-send-codec");
-      g_signal_emit_by_name (self, "send-codec-changed");
     }
     else
     {
-- 
1.5.6.5




More information about the farsight-commits mailing list