[farsight2/master] Remove local_codecs private member from the FsRtpSession (its always computer on demand now)

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


---
 gst/fsrtpconference/fs-rtp-session.c |   21 +--------------------
 1 files changed, 1 insertions(+), 20 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index ea50d5f..50d69be 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -130,8 +130,6 @@ struct _FsRtpSessionPrivate
 
   GList *local_codecs_configuration;
 
-  GList *local_codec_associations;
-
   /* These are protected by the session mutex */
   GList *negotiated_codec_associations;
 
@@ -495,9 +493,6 @@ fs_rtp_session_finalize (GObject *object)
   if (self->priv->local_codecs_configuration)
     fs_codec_list_destroy (self->priv->local_codecs_configuration);
 
-  if (self->priv->local_codec_associations)
-    codec_association_list_destroy (self->priv->local_codec_associations);
-
   if (self->priv->negotiated_codec_associations)
     codec_association_list_destroy (self->priv->negotiated_codec_associations);
 
@@ -640,18 +635,6 @@ fs_rtp_session_constructed (GObject *object)
     return;
   }
 
-  self->priv->local_codec_associations = create_local_codec_associations (
-      self->priv->blueprints,
-      NULL, /* there are no local codec configurations yet */
-      NULL);
-
-  if (!self->priv->local_codec_associations) {
-    self->priv->construction_error = g_error_new (FS_ERROR,
-      FS_ERROR_INTERNAL,
-      "No codecs found for the media type of this session");
-    return;
-  }
-
   tmp = g_strdup_printf ("valve_send_%u", self->id);
   valve = gst_element_factory_make ("fsvalve", tmp);
   g_free (tmp);
@@ -1249,9 +1232,7 @@ fs_rtp_session_set_local_codecs_config (FsSession *session,
 
   if (new_local_codec_associations)
   {
-    codec_association_list_destroy (self->priv->local_codec_associations);
-    self->priv->local_codec_associations = new_local_codec_associations;
-
+    codec_association_list_destroy (new_local_codec_associations);
     fs_codec_list_destroy (self->priv->local_codecs_configuration);
     self->priv->local_codecs_configuration =
       new_local_codecs_configuration;
-- 
1.5.6.5




More information about the farsight-commits mailing list