[farsight2/master] fsvalve is now valve in -bad

[Olivier Crête]

---
 gst/fsrtpconference/fs-rtp-session.c   |    9 +++------
 gst/fsrtpconference/fs-rtp-substream.c |    8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index cdadefa..0415147 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -955,14 +955,14 @@ fs_rtp_session_constructed (GObject *object)
   }
 
   tmp = g_strdup_printf ("valve_send_%u", self->id);
-  valve = gst_element_factory_make ("fsvalve", tmp);
+  valve = gst_element_factory_make ("valve", tmp);
   g_free (tmp);
 
   if (!valve)
   {
     self->priv->construction_error = g_error_new (FS_ERROR,
       FS_ERROR_CONSTRUCTION,
-      "Could not create the fsvalve element");
+      "Could not create the valve element");
     return;
   }
 
@@ -2683,12 +2683,9 @@ _create_codec_bin (const CodecAssociation *ca, const FsCodec *codec,
       current_element = gst_element_factory_make ("autoconvert", NULL);
 
       if (!current_element)
-        current_element = gst_element_factory_make ("fsselector", NULL);
-
-      if (!current_element)
       {
         g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not create autoconvert (ex-fsselector) element");
+          "Could not create autoconvert element");
         goto error;
       }
 
diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index b591b93..09dae34 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -507,12 +507,12 @@ fs_rtp_sub_stream_constructed (GObject *object)
 
   tmp = g_strdup_printf ("recv_valve_%d_%d_%d", self->priv->session->id,
       self->ssrc, self->pt);
-  self->priv->valve = gst_element_factory_make ("fsvalve", tmp);
+  self->priv->valve = gst_element_factory_make ("valve", tmp);
   g_free (tmp);
 
   if (!self->priv->valve) {
     self->priv->construction_error = g_error_new (FS_ERROR,
-      FS_ERROR_CONSTRUCTION, "Could not create a fsvalve element for"
+      FS_ERROR_CONSTRUCTION, "Could not create a valve element for"
       " session substream with ssrc: %u and pt:%d", self->ssrc,
       self->pt);
     return;
@@ -520,7 +520,7 @@ fs_rtp_sub_stream_constructed (GObject *object)
 
   if (!gst_bin_add (GST_BIN (self->priv->conference), self->priv->valve)) {
     self->priv->construction_error = g_error_new (FS_ERROR,
-      FS_ERROR_CONSTRUCTION, "Could not add the fsvalve element for session"
+      FS_ERROR_CONSTRUCTION, "Could not add the valve element for session"
       " substream with ssrc: %u and pt:%d to the conference bin",
       self->ssrc, self->pt);
     return;
@@ -534,7 +534,7 @@ fs_rtp_sub_stream_constructed (GObject *object)
   if (gst_element_set_state (self->priv->valve, GST_STATE_PLAYING) ==
     GST_STATE_CHANGE_FAILURE) {
     self->priv->construction_error = g_error_new (FS_ERROR,
-      FS_ERROR_CONSTRUCTION, "Could not set the fsvalve element for session"
+      FS_ERROR_CONSTRUCTION, "Could not set the valve element for session"
       " substream with ssrc: %u and pt:%d to the playing state",
       self->ssrc, self->pt);
     return;
-- 
1.5.6.5