gst/switch/gstswitch.*: Replace with files from gststreamselector.[ch], registered as the "switch" plugin, with "GstS...

Original commit message from CVS:
2007-12-17  Andy Wingo  <wingo@pobox.com>

* gst/switch/gstswitch.h:
* gst/switch/gstswitch.c: Replace with files from
gststreamselector.[ch], registered as the "switch" plugin, with
"GstSwitch" types. Patch 1/12.

2 files changed, 527 insertions, 720 deletions

diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index 9d9ff240..c1f48bde 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -1,5 +1,8 @@
 /* GStreamer
  * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
+ * Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * Copyright (C) 2005 Jan Schmidt <thaytan@mad.scientist.com>
+ * Copyright (C) 2007 Wim Taymans <wim.taymans@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,500 +24,477 @@
 #include "config.h"
 #endif
 
-/* Object header */
-#include "gstswitch.h"
-#include <gst/gst.h>
-
 #include <string.h>
 
-/* This element allows runtime switching between many sources. It outputs a
- * new segment every time it switches. The input sources are expected to be
- * rate controlled/live or synced to the clock using identity sync=true upstream
- * of this element. If they are not, your cpu usage will hike up.
- *
- * Example pipelines:
- * videotestsrc pattern=0 ! identity sync=true \
- *                                              switch ! ximagesink
- * videotestsrc pattern=1 ! identity sync=true /
- *
- * videotestsrc pattern=0 ! identity sync=true \
- *                                              switch ! 
- *                                               identity single-segment=true !
- *                                               theoraenc ! oggmux ! filesink
- * videotestsrc pattern=1 ! identity sync=true /
- *
- * To switch both an audio and a video stream, you need 2 switch elements
- * one for audio and one for video. To make sure they are in sync, the app
- * needs to do the following when switching:
- *
- * i) Block the sink pads of both the switch elements.
- * ii) Retrieve the last-timestamp property from both the switch elements
- * iii) Set the stop-value property on both the switch elements to the 
- *      highest of the 2.
- * iv) Set the active-sinkpad property on the switch elements to the sink
- *     pads to switch to.
- * v) Set the queue-buffers property on both the switch elements to True.
- * vi) Add buffer pad probes on the active sinkpad of each of the switch 
- *     elements. 
- * vii) Unblock the sink pads of both the swith elements.
- * viii) In the pad probes, store the buffer timestamp of the buffer that 
- *       comes in and remove the pad probe.
- * ix) Once both pad probes have been fired (one for video, one for audio), 
- *     then set the start-value property on both the switch elements to the 
- *     lower of the 2 buffer timestamps and set the queue-buffers property 
- *     on both the switch elements to False.
- *
- */
-enum
-{
-  ARG_0,
-  ARG_NB_SOURCES,
-  ARG_ACTIVE_SOURCE,
-  ARG_START_VALUE,
-  ARG_STOP_VALUE,
-  ARG_LAST_TS,
-  ARG_QUEUE_BUFFERS
-};
+#include "gstswitch.h"
+
+GST_DEBUG_CATEGORY_STATIC (stream_selector_debug);
+#define GST_CAT_DEFAULT stream_selector_debug
 
-GST_DEBUG_CATEGORY_STATIC (switch_debug);
-#define GST_CAT_DEFAULT switch_debug
-/* ElementFactory information */
-static const GstElementDetails gst_switch_details =
-GST_ELEMENT_DETAILS ("Switch",
+static const GstElementDetails gst_stream_selector_details =
+GST_ELEMENT_DETAILS ("StreamSelector",
     "Generic",
-    "N-to-1 input switching",
+    "N-to-1 input stream_selectoring",
     "Julien Moutte <julien@moutte.net>\n"
-    "Zaheer Merali <zaheerabbas at merali dot org>");
+    "Ronald S. Bultje <rbultje@ronald.bitfreak.net>\n"
+    "Jan Schmidt <thaytan@mad.scientist.com>\n"
+    "Wim Taymans <wim.taymans@gmail.com>");
 
-static GstStaticPadTemplate gst_switch_sink_factory =
+static GstStaticPadTemplate gst_stream_selector_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("sink%d",
     GST_PAD_SINK,
     GST_PAD_REQUEST,
     GST_STATIC_CAPS_ANY);
 
-static GstStaticPadTemplate gst_switch_src_factory =
+static GstStaticPadTemplate gst_stream_selector_src_factory =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS_ANY);
 
-static GstElementClass *parent_class = NULL;
-static GstCaps *gst_switch_getcaps (GstPad * pad);
-static GList *gst_switch_get_linked_pads (GstPad * pad);
-static GstFlowReturn gst_switch_bufferalloc (GstPad * pad, guint64 offset,
-    guint size, GstCaps * caps, GstBuffer ** buf);
-static GstFlowReturn gst_switch_chain (GstPad * pad, GstBuffer * buf);
-static gboolean gst_switch_event (GstPad * pad, GstEvent * event);
+enum
+{
+  PROP_ACTIVE_PAD = 1
+};
 
-/* ============================================================= */
-/*                                                               */
-/*                       Private Methods                         */
-/*                                                               */
-/* ============================================================= */
+static gboolean gst_stream_selector_is_active_sinkpad (GstStreamSelector * sel,
+    GstPad * pad);
+static GstPad *gst_stream_selector_activate_sinkpad (GstStreamSelector * sel,
+    GstPad * pad);
+static GstPad *gst_stream_selector_get_linked_pad (GstPad * pad,
+    gboolean strict);
+
+#define GST_TYPE_SELECTOR_PAD \
+  (gst_selector_pad_get_type())
+#define GST_SELECTOR_PAD(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SELECTOR_PAD, GstSelectorPad))
+#define GST_SELECTOR_PAD_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SELECTOR_PAD, GstSelectorPadClass))
+#define GST_IS_SELECTOR_PAD(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SELECTOR_PAD))
+#define GST_IS_SELECTOR_PAD_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SELECTOR_PAD))
+#define GST_SELECTOR_PAD_CAST(obj) \
+  ((GstSelectorPad *)(obj))
+
+typedef struct _GstSelectorPad GstSelectorPad;
+typedef struct _GstSelectorPadClass GstSelectorPadClass;
+
+struct _GstSelectorPad
+{
+  GstPad parent;
 
+  gboolean active;
+  gboolean eos;
+  gboolean segment_pending;
+  GstSegment segment;
+};
 
-static void
-gst_switch_release_pad (GstElement * element, GstPad * pad)
+struct _GstSelectorPadClass
 {
-  GstSwitch *gstswitch = NULL;
+  GstPadClass parent;
+};
 
-  g_return_if_fail (GST_IS_SWITCH (element));
+static void gst_selector_pad_class_init (GstSelectorPadClass * klass);
+static void gst_selector_pad_init (GstSelectorPad * pad);
+static void gst_selector_pad_finalize (GObject * object);
 
-  gstswitch = GST_SWITCH (element);
+static GstPadClass *selector_pad_parent_class = NULL;
 
-  GST_LOG_OBJECT (gstswitch, "releasing requested pad %p", pad);
+static void gst_selector_pad_reset (GstSelectorPad * pad);
+static gboolean gst_selector_pad_event (GstPad * pad, GstEvent * event);
+static GstCaps *gst_selector_pad_getcaps (GstPad * pad);
+static GList *gst_selector_pad_get_linked_pads (GstPad * pad);
+static GstFlowReturn gst_selector_pad_chain (GstPad * pad, GstBuffer * buf);
+static GstFlowReturn gst_selector_pad_bufferalloc (GstPad * pad,
+    guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf);
 
-  gst_element_remove_pad (element, pad);
-  GST_OBJECT_LOCK (gstswitch);
-  gstswitch->nb_sinkpads--;
-  GST_SWITCH_LOCK (gstswitch);
-  if (gstswitch->active_sinkpad == pad) {
-    gst_object_unref (gstswitch->active_sinkpad);
-    gstswitch->active_sinkpad = NULL;
-    if (gstswitch->nb_sinkpads == 0) {
-      GstIterator *iter =
-          gst_element_iterate_sink_pads (GST_ELEMENT (gstswitch));
-      gpointer active_sinkpad_store = (gpointer) gstswitch->active_sinkpad;
+static GType
+gst_selector_pad_get_type (void)
+{
+  static GType selector_pad_type = 0;
 
-      if (gst_iterator_next (iter, &active_sinkpad_store) == GST_ITERATOR_DONE) {
-        GST_LOG_OBJECT (gstswitch, "active pad now %p",
-            gstswitch->active_sinkpad);
-      } else {
-        GST_LOG_OBJECT (gstswitch, "could not get first sinkpad");
-      }
-      gst_iterator_free (iter);
-    }
+  if (!selector_pad_type) {
+    static const GTypeInfo selector_pad_info = {
+      sizeof (GstSelectorPadClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) gst_selector_pad_class_init,
+      NULL,
+      NULL,
+      sizeof (GstSelectorPad),
+      0,
+      (GInstanceInitFunc) gst_selector_pad_init,
+    };
+
+    selector_pad_type =
+        g_type_register_static (GST_TYPE_PAD, "GstSwitchPad",
+        &selector_pad_info, 0);
   }
-  GST_SWITCH_UNLOCK (gstswitch);
-  GST_OBJECT_UNLOCK (gstswitch);
+  return selector_pad_type;
 }
 
-static GstPad *
-gst_switch_request_new_pad (GstElement * element,
-    GstPadTemplate * templ, const gchar * unused)
+static void
+gst_selector_pad_class_init (GstSelectorPadClass * klass)
 {
-  gchar *name = NULL;
-  GstPad *sinkpad = NULL;
-  GstSwitch *gstswitch = NULL;
+  GObjectClass *gobject_class;
 
-  g_return_val_if_fail (GST_IS_SWITCH (element), NULL);
+  gobject_class = (GObjectClass *) klass;
+
+  selector_pad_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class->finalize = gst_selector_pad_finalize;
+}
+
+static void
+gst_selector_pad_init (GstSelectorPad * pad)
+{
+}
+
+static void
+gst_selector_pad_finalize (GObject * object)
+{
+  GstSelectorPad *pad;
+
+  pad = GST_SELECTOR_PAD_CAST (object);
 
-  gstswitch = GST_SWITCH (element);
+  G_OBJECT_CLASS (selector_pad_parent_class)->finalize (object);
+}
+
+static void
+gst_selector_pad_reset (GstSelectorPad * pad)
+{
+  pad->active = FALSE;
+  pad->eos = FALSE;
+  gst_segment_init (&pad->segment, GST_FORMAT_UNDEFINED);
+}
 
-  /* We only provide requested sink pads */
-  if (templ->direction != GST_PAD_SINK) {
-    GST_LOG_OBJECT (gstswitch, "requested a non sink pad");
+/* strictly get the linked pad from the sinkpad. If the pad is active we return
+ * the srcpad else we return NULL */
+static GList *
+gst_selector_pad_get_linked_pads (GstPad * pad)
+{
+  GstPad *otherpad;
+
+  otherpad = gst_stream_selector_get_linked_pad (pad, TRUE);
+  if (!otherpad)
     return NULL;
-  }
 
-  GST_OBJECT_LOCK (gstswitch);
-  name = g_strdup_printf ("sink%d", gstswitch->nb_sinkpads);
+  /* need to drop the ref, internal linked pads is not MT safe */
+  gst_object_unref (otherpad);
 
-  sinkpad = gst_pad_new_from_template (templ, name);
+  return g_list_append (NULL, otherpad);
+}
 
-  if (name)
-    g_free (name);
+static gboolean
+gst_selector_pad_event (GstPad * pad, GstEvent * event)
+{
+  gboolean res = TRUE;
+  gboolean forward = TRUE;
+  GstStreamSelector *sel;
+  GstSelectorPad *selpad;
 
-  GST_SWITCH_LOCK (gstswitch);
-  if (gstswitch->active_sinkpad == NULL)
-    gstswitch->active_sinkpad = gst_object_ref (sinkpad);
-  GST_SWITCH_UNLOCK (gstswitch);
-  GST_OBJECT_UNLOCK (gstswitch);
+  sel = GST_STREAM_SELECTOR (gst_pad_get_parent (pad));
+  selpad = GST_SELECTOR_PAD_CAST (pad);
 
-  gst_pad_set_getcaps_function (sinkpad,
-      GST_DEBUG_FUNCPTR (gst_switch_getcaps));
-  gst_pad_set_chain_function (sinkpad, GST_DEBUG_FUNCPTR (gst_switch_chain));
-  gst_pad_set_internal_link_function (sinkpad,
-      GST_DEBUG_FUNCPTR (gst_switch_get_linked_pads));
-  gst_pad_set_bufferalloc_function (sinkpad,
-      GST_DEBUG_FUNCPTR (gst_switch_bufferalloc));
-  gst_pad_set_event_function (sinkpad, GST_DEBUG_FUNCPTR (gst_switch_event));
-  gst_pad_set_active (sinkpad, TRUE);
+  /* only forward if we are dealing with the active sinkpad */
+  forward = gst_stream_selector_is_active_sinkpad (sel, pad);
 
-  gst_element_add_pad (GST_ELEMENT (gstswitch), sinkpad);
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_STOP:
+      gst_selector_pad_reset (selpad);
+      break;
+    case GST_EVENT_NEWSEGMENT:
+    {
+      gboolean update;
+      GstFormat format;
+      gdouble rate, arate;
+      gint64 start, stop, time;
+
+      gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
+          &start, &stop, &time);
+
+      GST_DEBUG_OBJECT (sel,
+          "configured NEWSEGMENT update %d, rate %lf, applied rate %lf, "
+          "format %d, "
+          "%" G_GINT64_FORMAT " -- %" G_GINT64_FORMAT ", time %"
+          G_GINT64_FORMAT, update, rate, arate, format, start, stop, time);
+
+      gst_segment_set_newsegment_full (&selpad->segment, update,
+          rate, arate, format, start, stop, time);
+      /* if we are not going to forward the segment, mark the segment as
+       * pending */
+      if (!forward)
+        selpad->segment_pending = TRUE;
+      break;
+    }
+    case GST_EVENT_EOS:
+      selpad->eos = TRUE;
+      break;
+    default:
+      break;
+  }
+  if (forward)
+    res = gst_pad_push_event (sel->srcpad, event);
 
-  gstswitch->nb_sinkpads++;
+  gst_object_unref (sel);
 
-  return sinkpad;
+  return res;
+}
+
+static GstCaps *
+gst_selector_pad_getcaps (GstPad * pad)
+{
+  GstStreamSelector *sel;
+  GstCaps *caps;
+
+  sel = GST_STREAM_SELECTOR (gst_pad_get_parent (pad));
+
+  GST_DEBUG_OBJECT (sel, "Getting caps of srcpad peer");
+  caps = gst_pad_peer_get_caps (sel->srcpad);
+  if (caps == NULL)
+    caps = gst_caps_new_any ();
+
+  gst_object_unref (sel);
+
+  return caps;
 }
 
 static GstFlowReturn
-gst_switch_chain (GstPad * pad, GstBuffer * buf)
+gst_selector_pad_bufferalloc (GstPad * pad, guint64 offset,
+    guint size, GstCaps * caps, GstBuffer ** buf)
 {
-  GstSwitch *gstswitch = GST_SWITCH (gst_pad_get_parent (pad));
-  GstFlowReturn res;
+  GstStreamSelector *sel;
+  GstFlowReturn result;
   GstPad *active_sinkpad;
 
-  GST_SWITCH_LOCK (gstswitch);
-  active_sinkpad = gstswitch->active_sinkpad;
+  sel = GST_STREAM_SELECTOR (gst_pad_get_parent (pad));
 
-  /* Ignore buffers from pads except the selected one */
+  active_sinkpad = gst_stream_selector_activate_sinkpad (sel, pad);
+
+  /* Fallback allocation for buffers from pads except the selected one */
   if (pad != active_sinkpad) {
-    GST_SWITCH_UNLOCK (gstswitch);
+    GST_DEBUG_OBJECT (sel,
+        "Pad %s:%s is not selected. Performing fallback allocation",
+        GST_DEBUG_PAD_NAME (pad));
 
-    GST_LOG_OBJECT (gstswitch, "Ignoring buffer %p from pad %s:%s",
-        buf, GST_DEBUG_PAD_NAME (pad));
+    *buf = NULL;
+    result = GST_FLOW_OK;
+  } else {
+    result = gst_pad_alloc_buffer (sel->srcpad, offset, size, caps, buf);
 
-    gst_object_unref (gstswitch);
-    gst_buffer_unref (buf);
-    return GST_FLOW_OK;
+    /* FIXME: HACK. If buffer alloc returns not-linked, perform a fallback
+     * allocation.  This should NOT be necessary, because playbin should
+     * properly block the source pad from running until it's finished hooking 
+     * everything up, but playbin needs refactoring first. */
+    if (result == GST_FLOW_NOT_LINKED) {
+      GST_DEBUG_OBJECT (sel,
+          "No peer pad yet - performing fallback allocation for pad %s:%s",
+          GST_DEBUG_PAD_NAME (pad));
+
+      *buf = NULL;
+      result = GST_FLOW_OK;
+    }
   }
 
-  /* check if we need to send a new segment event */
-  if (gstswitch->need_to_send_newsegment && !gstswitch->queue_buffers) {
-    GstEvent *event;
-    GList *buffers;
-
-    /* check to see if we need to send a new segment update for stop */
-    if (gstswitch->previous_sinkpad != NULL) {
-      if (gstswitch->stop_value != GST_CLOCK_TIME_NONE) {
-        GstEvent *prev_newsegment =
-            (GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events,
-            gstswitch->previous_sinkpad);
-
-        if (prev_newsegment) {
-          /* need to send a new segment update changing stop */
-          gboolean update;
-          gdouble rate, applied_rate;
-          GstFormat format;
-          gint64 start, stop, position;
-          GstEvent *newsegment_event;
-
-          gst_event_parse_new_segment_full (prev_newsegment, &update, &rate,
-              &applied_rate, &format, &start, &stop, &position);
-          GST_DEBUG_OBJECT (gstswitch,
-              "Sending new segment update with stop of %" G_GUINT64_FORMAT
-              "and start of %" G_GUINT64_FORMAT, gstswitch->stop_value,
-              gstswitch->current_start);
-          newsegment_event = gst_event_new_new_segment_full (TRUE, rate,
-              applied_rate, format, gstswitch->current_start,
-              gstswitch->stop_value, position);
-          GST_SWITCH_UNLOCK (gstswitch);
-          gst_pad_push_event (gstswitch->srcpad, newsegment_event);
-          GST_SWITCH_LOCK (gstswitch);
-        } else {
-          GST_WARNING_OBJECT (gstswitch,
-              "Sinkpad %s:%s had no previous new segment!",
-              GST_DEBUG_PAD_NAME (gstswitch->previous_sinkpad));
-        }
+  gst_object_unref (sel);
 
-      }
-      gst_object_unref (GST_OBJECT (gstswitch->previous_sinkpad));
-      gstswitch->previous_sinkpad = NULL;
-    }
-    /* retrieve event from hash table */
-    event =
-        (GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events, pad);
-    if (event) {
-      /* create a copy of this event so we can change start to match
-       * the start time of this buffer */
-      gboolean update;
-      gdouble rate, applied_rate;
-      GstFormat format;
-      gint64 start, stop, position;
-      GstEvent *newsegment_event;
-
-      gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
-          &format, &start, &stop, &position);
-      if (gstswitch->start_value <= GST_BUFFER_TIMESTAMP (buf)
-          && gstswitch->start_value != GST_CLOCK_TIME_NONE) {
-        start = gstswitch->start_value;
-      } else {
-        start = GST_BUFFER_TIMESTAMP (buf);
-      }
-      if (start == GST_CLOCK_TIME_NONE) {
-        GST_WARNING_OBJECT (gstswitch,
-            "new segment event requested to be sent but start value is NONE");
-      }
-      newsegment_event = gst_event_new_new_segment_full (FALSE, rate,
-          applied_rate, format, start, stop, position);
-      GST_SWITCH_UNLOCK (gstswitch);
-      gst_pad_push_event (gstswitch->srcpad, newsegment_event);
-      GST_SWITCH_LOCK (gstswitch);
-      gstswitch->need_to_send_newsegment = FALSE;
-      gstswitch->current_start = start;
-      GST_DEBUG_OBJECT (gstswitch,
-          "Sending new segment with start of %" G_GUINT64_FORMAT, start);
-    } else {
-      GST_WARNING_OBJECT (gstswitch,
-          "Couldn't find new segment for pad %s in hashtable",
-          GST_PAD_NAME (pad));
-    }
-    /* reset stop and start value */
-    gstswitch->start_value = GST_CLOCK_TIME_NONE;
-    gstswitch->stop_value = GST_CLOCK_TIME_NONE;
-    /* send all the stored buffers if any */
-    buffers =
-        g_hash_table_lookup (gstswitch->stored_buffers,
-        gstswitch->active_sinkpad);
-    while (buffers != NULL) {
-      gst_buffer_ref (GST_BUFFER (buffers->data));
-      GST_SWITCH_UNLOCK (gstswitch);
-      gst_pad_push (gstswitch->srcpad, GST_BUFFER (buffers->data));
-      GST_SWITCH_LOCK (gstswitch);
-      buffers = buffers->next;
-    }
-    g_hash_table_remove (gstswitch->stored_buffers, gstswitch->active_sinkpad);
+  return result;
+}
+
+static GstFlowReturn
+gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
+{
+  GstStreamSelector *sel;
+  GstFlowReturn res;
+  GstPad *active_sinkpad;
+  GstSelectorPad *selpad;
+  GstClockTime timestamp;
+  GstSegment *seg;
+
+  sel = GST_STREAM_SELECTOR (gst_pad_get_parent (pad));
+  selpad = GST_SELECTOR_PAD_CAST (pad);
+  seg = &selpad->segment;
+
+  active_sinkpad = gst_stream_selector_activate_sinkpad (sel, pad);
+
+  timestamp = GST_BUFFER_TIMESTAMP (buf);
+  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    GST_DEBUG_OBJECT (sel, "received timestamp %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (timestamp));
+    gst_segment_set_last_stop (seg, seg->format, timestamp);
   }
 
-  gstswitch->last_ts = GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf);
-  if (!gstswitch->queue_buffers) {
-    /* forward */
-    GST_LOG_OBJECT (gstswitch, "Forwarding buffer %p from pad %s:%s to %s:%s",
-        buf, GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (gstswitch->srcpad));
-    GST_SWITCH_UNLOCK (gstswitch);
-    res = gst_pad_push (gstswitch->srcpad, buf);
-    GST_SWITCH_LOCK (gstswitch);
-    GST_LOG_OBJECT (gstswitch, "Finished pushing buffer");
-  } else {
-    GList *buffers;
-    gboolean lookup_res = TRUE;
-
-    buffers = g_hash_table_lookup (gstswitch->stored_buffers, active_sinkpad);
-    if (buffers == NULL)
-      lookup_res = FALSE;
-    buffers = g_list_append (buffers, buf);
-    /* only need to insert it if it was NULL before because we appended */
-    if (!lookup_res)
-      g_hash_table_insert (gstswitch->stored_buffers, active_sinkpad, buffers);
-    res = GST_FLOW_OK;
+  /* Ignore buffers from pads except the selected one */
+  if (pad != active_sinkpad)
+    goto ignore;
+
+  /* if we have a pending segment, push it out now */
+  if (selpad->segment_pending) {
+    gst_pad_push_event (sel->srcpad, gst_event_new_new_segment_full (FALSE,
+            seg->rate, seg->applied_rate, seg->format, seg->start, seg->stop,
+            seg->time));
+
+    selpad->segment_pending = FALSE;
   }
-  GST_SWITCH_UNLOCK (gstswitch);
-  gst_object_unref (gstswitch);
 
+  /* forward */
+  GST_DEBUG_OBJECT (sel, "Forwarding buffer %p from pad %s:%s", buf,
+      GST_DEBUG_PAD_NAME (pad));
+  res = gst_pad_push (sel->srcpad, buf);
+done:
+  gst_object_unref (sel);
   return res;
+  /* dropped buffers */
+ignore:
+  {
+    GST_DEBUG_OBJECT (sel, "Ignoring buffer %p from pad %s:%s",
+        buf, GST_DEBUG_PAD_NAME (pad));
+    gst_buffer_unref (buf);
+    res = GST_FLOW_NOT_LINKED;
+    goto done;
+  }
+
 }
 
-static gboolean
-gst_switch_event (GstPad * pad, GstEvent * event)
+static void gst_stream_selector_dispose (GObject * object);
+static void gst_stream_selector_init (GstStreamSelector * sel);
+static void gst_stream_selector_base_init (GstStreamSelectorClass * klass);
+static void gst_stream_selector_class_init (GstStreamSelectorClass * klass);
+static void gst_stream_selector_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_stream_selector_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static GstPad *gst_stream_selector_request_new_pad (GstElement * element,
+    GstPadTemplate * templ, const gchar * unused);
+static void gst_stream_selector_release_pad (GstElement * element,
+    GstPad * pad);
+static GList *gst_stream_selector_get_linked_pads (GstPad * pad);
+static GstCaps *gst_stream_selector_getcaps (GstPad * pad);
+static GstElementClass *parent_class = NULL;
+
+GType
+gst_stream_selector_get_type (void)
 {
-  GstSwitch *gstswitch = GST_SWITCH (gst_pad_get_parent (pad));
-  gboolean ret = TRUE;
+  static GType stream_selector_type = 0;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_NEWSEGMENT:
-      GST_SWITCH_LOCK (gstswitch);
-      /* need to put in or replace what's in hash table */
-      g_hash_table_replace (gstswitch->newsegment_events, pad, event);
-      if (pad == gstswitch->active_sinkpad) {
-        if (!gstswitch->need_to_send_newsegment) {
-          gstswitch->need_to_send_newsegment = TRUE;
-        }
-      }
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    default:
-      ret = gst_pad_event_default (pad, event);
-      break;
+  if (!stream_selector_type) {
+    static const GTypeInfo stream_selector_info = {
+      sizeof (GstStreamSelectorClass),
+      (GBaseInitFunc) gst_stream_selector_base_init,
+      NULL,
+      (GClassInitFunc) gst_stream_selector_class_init,
+      NULL,
+      NULL,
+      sizeof (GstStreamSelector),
+      0,
+      (GInstanceInitFunc) gst_stream_selector_init,
+    };
+    stream_selector_type =
+        g_type_register_static (GST_TYPE_ELEMENT,
+        "GstSwitch", &stream_selector_info, 0);
+    GST_DEBUG_CATEGORY_INIT (stream_selector_debug,
+        "streamselector", 0, "A stream-selector element");
   }
-  gst_object_unref (gstswitch);
-  return ret;
+
+  return stream_selector_type;
 }
 
-/* =========================================== */
-/*                                             */
-/*                 Properties                  */
-/*                                             */
-/* =========================================== */
+static void
+gst_stream_selector_base_init (GstStreamSelectorClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  gst_element_class_set_details (element_class, &gst_stream_selector_details);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_stream_selector_sink_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_stream_selector_src_factory));
+}
 
 static void
-gst_switch_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
+gst_stream_selector_class_init (GstStreamSelectorClass * klass)
 {
-  GstSwitch *gstswitch = NULL;
-  const gchar *pad_name;
-  GstPad *pad = NULL;
-  GstPad **active_pad_p;
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
 
-  g_return_if_fail (GST_IS_SWITCH (object));
+  parent_class = g_type_class_peek_parent (klass);
+  gobject_class->set_property =
+      GST_DEBUG_FUNCPTR (gst_stream_selector_set_property);
+  gobject_class->get_property =
+      GST_DEBUG_FUNCPTR (gst_stream_selector_get_property);
+  g_object_class_install_property (gobject_class, PROP_ACTIVE_PAD,
+      g_param_spec_string ("active-pad", "Active pad",
+          "Name of the currently" " active sink pad", NULL, G_PARAM_READWRITE));
+  gobject_class->dispose = gst_stream_selector_dispose;
+  gstelement_class->request_new_pad = gst_stream_selector_request_new_pad;
+  gstelement_class->release_pad = gst_stream_selector_release_pad;
+}
 
-  gstswitch = GST_SWITCH (object);
+static void
+gst_stream_selector_init (GstStreamSelector * sel)
+{
+  sel->srcpad = gst_pad_new ("src", GST_PAD_SRC);
+  gst_pad_set_internal_link_function (sel->srcpad,
+      GST_DEBUG_FUNCPTR (gst_stream_selector_get_linked_pads));
+  gst_pad_set_getcaps_function (sel->srcpad,
+      GST_DEBUG_FUNCPTR (gst_stream_selector_getcaps));
+  gst_element_add_pad (GST_ELEMENT (sel), sel->srcpad);
+  /* sinkpad management */
+  sel->active_sinkpad = NULL;
+  sel->nb_sinkpads = 0;
+  gst_segment_init (&sel->segment, GST_FORMAT_UNDEFINED);
+}
+
+static void
+gst_stream_selector_dispose (GObject * object)
+{
+  GstStreamSelector *sel = GST_STREAM_SELECTOR (object);
+
+  if (sel->active_sinkpad) {
+    gst_object_unref (sel->active_sinkpad);
+    sel->active_sinkpad = NULL;
+  }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_stream_selector_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstStreamSelector *sel = GST_STREAM_SELECTOR (object);
 
   switch (prop_id) {
-    case ARG_ACTIVE_SOURCE:
-      pad_name = g_value_get_string (value);
-      if (strcmp (pad_name, "") != 0) {
-        pad = gst_element_get_pad (GST_ELEMENT (object), pad_name);
-      }
+    case PROP_ACTIVE_PAD:{
+      const gchar *pad_name = g_value_get_string (value);
+      GstPad *pad = NULL;
+      GstPad **active_pad_p;
 
-      GST_SWITCH_LOCK (gstswitch);
-      if (pad == gstswitch->active_sinkpad) {
-        GST_SWITCH_UNLOCK (gstswitch);
-        if (pad)
-          gst_object_unref (pad);
-        break;
-      }
-      active_pad_p = &gstswitch->active_sinkpad;
-      if (gstswitch->previous_sinkpad != NULL) {
-        gst_object_unref (GST_OBJECT (gstswitch->previous_sinkpad));
-      }
-      gstswitch->previous_sinkpad = gstswitch->active_sinkpad;
-      gst_object_ref (GST_OBJECT (gstswitch->previous_sinkpad));
-      gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad));
-      if (pad)
-        gst_object_unref (pad);
-      GST_DEBUG_OBJECT (gstswitch, "New active pad is %" GST_PTR_FORMAT,
-          gstswitch->active_sinkpad);
-      gstswitch->need_to_send_newsegment = TRUE;
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_START_VALUE:
-      GST_SWITCH_LOCK (gstswitch);
-      gstswitch->start_value = g_value_get_uint64 (value);
-      /* let's send new segment here instead of waiting for the next buffer
-       * as we know the start value for the new segment */
-      /* check if we need to send a new segment event */
-      if (gstswitch->start_value != GST_CLOCK_TIME_NONE &&
-          gstswitch->need_to_send_newsegment) {
-        GstEvent *event;
-
-        /* check to see if we need to send a new segment update for stop */
-        if (gstswitch->previous_sinkpad != NULL) {
-          if (gstswitch->stop_value != GST_CLOCK_TIME_NONE) {
-            GstEvent *prev_newsegment =
-                (GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events,
-                gstswitch->previous_sinkpad);
-
-            if (prev_newsegment) {
-              /* need to send a new segment update changing stop */
-              gboolean update;
-              gdouble rate, applied_rate;
-              GstFormat format;
-              gint64 start, stop, position;
-              GstEvent *newsegment_event;
-
-              gst_event_parse_new_segment_full (prev_newsegment, &update, &rate,
-                  &applied_rate, &format, &start, &stop, &position);
-              GST_DEBUG_OBJECT (gstswitch,
-                  "Sending new segment update with stop of %" G_GUINT64_FORMAT
-                  "and start of %" G_GUINT64_FORMAT, gstswitch->stop_value,
-                  gstswitch->current_start);
-              newsegment_event = gst_event_new_new_segment_full (TRUE, rate,
-                  applied_rate, format, gstswitch->current_start,
-                  gstswitch->stop_value, position);
-              GST_SWITCH_UNLOCK (gstswitch);
-              gst_pad_push_event (gstswitch->srcpad, newsegment_event);
-              GST_SWITCH_LOCK (gstswitch);
-            } else {
-              GST_WARNING_OBJECT (gstswitch,
-                  "Sinkpad %s:%s had no previous new segment!",
-                  GST_DEBUG_PAD_NAME (gstswitch->previous_sinkpad));
-            }
-
-          }
-          gst_object_unref (GST_OBJECT (gstswitch->previous_sinkpad));
-          gstswitch->previous_sinkpad = NULL;
-        }
-        /* retrieve event from hash table */
-        event =
-            (GstEvent *) g_hash_table_lookup (gstswitch->newsegment_events,
-            gstswitch->active_sinkpad);
-        if (event) {
-          /* create a copy of this event so we can change start to match
-           * the start time of this buffer */
-          gboolean update;
-          gdouble rate, applied_rate;
-          GstFormat format;
-          gint64 start, stop, position;
-          GstEvent *newsegment_event;
-
-          gst_event_parse_new_segment_full (event, &update, &rate,
-              &applied_rate, &format, &start, &stop, &position);
-          start = gstswitch->start_value;
-          if (start == GST_CLOCK_TIME_NONE) {
-            GST_WARNING_OBJECT (gstswitch,
-                "new segment event requested to be sent but start value is NONE");
-          }
-          newsegment_event = gst_event_new_new_segment_full (FALSE, rate,
-              applied_rate, format, start, stop, position);
-          GST_SWITCH_UNLOCK (gstswitch);
-          gst_pad_push_event (gstswitch->srcpad, newsegment_event);
-          GST_SWITCH_LOCK (gstswitch);
-          gstswitch->need_to_send_newsegment = FALSE;
-          gstswitch->current_start = start;
-          GST_DEBUG_OBJECT (gstswitch,
-              "Sending new segment with start of %" G_GUINT64_FORMAT, start);
+      if (strcmp (pad_name, "") != 0)
+        pad = gst_element_get_pad (GST_ELEMENT (object), pad_name);
+      GST_OBJECT_LOCK (object);
+      if (pad != sel->active_sinkpad) {
+        GstSelectorPad *selpad;
+
+        selpad = GST_SELECTOR_PAD_CAST (pad);
+        /* we can only activate pads that have data received */
+        if (selpad && !selpad->active) {
+          GST_DEBUG_OBJECT (sel, "No data received on pad %" GST_PTR_FORMAT,
+              pad);
         } else {
-          GST_WARNING_OBJECT (gstswitch,
-              "Couldn't find new segment for pad %s in hashtable",
-              GST_PAD_NAME (gstswitch->active_sinkpad));
+          active_pad_p = &sel->active_sinkpad;
+          gst_object_replace ((GstObject **) active_pad_p,
+              GST_OBJECT_CAST (pad));
+          GST_DEBUG_OBJECT (sel, "New active pad is %" GST_PTR_FORMAT,
+              sel->active_sinkpad);
         }
-        /* reset stop and start value */
-        gstswitch->start_value = GST_CLOCK_TIME_NONE;
-        gstswitch->stop_value = GST_CLOCK_TIME_NONE;
       }
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_STOP_VALUE:
-      GST_SWITCH_LOCK (gstswitch);
-      gstswitch->stop_value = g_value_get_uint64 (value);
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_QUEUE_BUFFERS:
-      GST_SWITCH_LOCK (gstswitch);
-      gstswitch->queue_buffers = g_value_get_boolean (value);
-      GST_SWITCH_UNLOCK (gstswitch);
+      GST_OBJECT_UNLOCK (object);
+      if (pad)
+        gst_object_unref (pad);
       break;
+    }
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -522,51 +502,22 @@ gst_switch_set_property (GObject * object, guint prop_id,
 }
 
 static void
-gst_switch_get_property (GObject * object, guint prop_id,
+gst_stream_selector_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
-  GstSwitch *gstswitch = NULL;
-
-  g_return_if_fail (GST_IS_SWITCH (object));
-
-  gstswitch = GST_SWITCH (object);
+  GstStreamSelector *sel = GST_STREAM_SELECTOR (object);
 
   switch (prop_id) {
-    case ARG_ACTIVE_SOURCE:
-      GST_SWITCH_LOCK (gstswitch);
-      if (gstswitch->active_sinkpad != NULL) {
-        g_value_take_string (value,
-            gst_pad_get_name (gstswitch->active_sinkpad));
+    case PROP_ACTIVE_PAD:{
+      GST_OBJECT_LOCK (object);
+      if (sel->active_sinkpad != NULL) {
+        g_value_take_string (value, gst_pad_get_name (sel->active_sinkpad));
       } else {
         g_value_set_string (value, "");
       }
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_NB_SOURCES:
-      GST_OBJECT_LOCK (object);
-      g_value_set_uint (value, gstswitch->nb_sinkpads);
       GST_OBJECT_UNLOCK (object);
       break;
-    case ARG_START_VALUE:
-      GST_SWITCH_LOCK (gstswitch);
-      g_value_set_uint64 (value, gstswitch->start_value);
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_STOP_VALUE:
-      GST_SWITCH_LOCK (gstswitch);
-      g_value_set_uint64 (value, gstswitch->stop_value);
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_LAST_TS:
-      GST_SWITCH_LOCK (gstswitch);
-      g_value_set_uint64 (value, gstswitch->last_ts);
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
-    case ARG_QUEUE_BUFFERS:
-      GST_SWITCH_LOCK (gstswitch);
-      g_value_set_boolean (value, gstswitch->queue_buffers);
-      GST_SWITCH_UNLOCK (gstswitch);
-      break;
+    }
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -574,284 +525,162 @@ gst_switch_get_property (GObject * object, guint prop_id,
 }
 
 static GstPad *
-gst_switch_get_linked_pad (GstPad * pad, gboolean strict)
+gst_stream_selector_get_linked_pad (GstPad * pad, gboolean strict)
 {
-  GstSwitch *gstswitch = GST_SWITCH (gst_pad_get_parent (pad));
+  GstStreamSelector *sel;
   GstPad *otherpad = NULL;
 
-  if (pad == gstswitch->srcpad)
-    otherpad = gstswitch->active_sinkpad;
-  else if (pad == gstswitch->active_sinkpad || !strict)
-    otherpad = gstswitch->srcpad;
-
-  gst_object_unref (gstswitch);
-
+  sel = GST_STREAM_SELECTOR (gst_pad_get_parent (pad));
+  GST_OBJECT_LOCK (sel);
+  if (pad == sel->srcpad)
+    otherpad = sel->active_sinkpad;
+  else if (pad == sel->active_sinkpad || !strict)
+    otherpad = sel->srcpad;
+  if (otherpad)
+    gst_object_ref (otherpad);
+  GST_OBJECT_UNLOCK (sel);
+  gst_object_unref (sel);
   return otherpad;
 }
 
 static GstCaps *
-gst_switch_getcaps (GstPad * pad)
+gst_stream_selector_getcaps (GstPad * pad)
 {
   GstPad *otherpad;
   GstObject *parent;
   GstCaps *caps;
 
-
+  otherpad = gst_stream_selector_get_linked_pad (pad, FALSE);
   parent = gst_object_get_parent (GST_OBJECT (pad));
-  GST_SWITCH_LOCK (GST_SWITCH (parent));
-  otherpad = gst_switch_get_linked_pad (pad, FALSE);
-  GST_SWITCH_UNLOCK (GST_SWITCH (parent));
   if (!otherpad) {
     GST_DEBUG_OBJECT (parent,
         "Pad %s:%s not linked, returning ANY", GST_DEBUG_PAD_NAME (pad));
-    gst_object_unref (parent);
-    return gst_caps_new_any ();
+    caps = gst_caps_new_any ();
+  } else {
+    GST_DEBUG_OBJECT (parent,
+        "Pad %s:%s is linked (to %s:%s), returning peer caps",
+        GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (otherpad));
+    /* if the peer has caps, use those. If the pad is not linked, this function
+     * returns NULL and we return ANY */
+    if (!(caps = gst_pad_peer_get_caps (otherpad)))
+      caps = gst_caps_new_any ();
+    gst_object_unref (otherpad);
   }
 
-  GST_DEBUG_OBJECT (parent,
-      "Pad %s:%s is linked (to %s:%s), returning allowed-caps",
-      GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (otherpad));
-
   gst_object_unref (parent);
-
-  caps = gst_pad_peer_get_caps (otherpad);
-  if (caps == NULL) {
-    caps = gst_caps_new_any ();
-  }
   return caps;
 }
 
-static GstFlowReturn
-gst_switch_bufferalloc (GstPad * pad, guint64 offset,
-    guint size, GstCaps * caps, GstBuffer ** buf)
+/* check if the pad is the active sinkpad */
+static gboolean
+gst_stream_selector_is_active_sinkpad (GstStreamSelector * sel, GstPad * pad)
 {
-  GstSwitch *gstswitch = GST_SWITCH (gst_pad_get_parent (pad));
-  GstFlowReturn result;
-  GstPad *active_sinkpad;
+  GstSelectorPad *selpad;
+  gboolean res;
 
-  active_sinkpad = gstswitch->active_sinkpad;
+  selpad = GST_SELECTOR_PAD_CAST (pad);
 
-  /* Fallback allocation for buffers from pads except the selected one */
-  if (pad != active_sinkpad) {
-    GST_DEBUG_OBJECT (gstswitch,
-        "Pad %s:%s is not selected. Performing fallback allocation",
-        GST_DEBUG_PAD_NAME (pad));
+  GST_OBJECT_LOCK (sel);
+  res = (pad == sel->active_sinkpad);
+  GST_OBJECT_UNLOCK (sel);
 
-    *buf = NULL;
-    result = GST_FLOW_OK;
-  } else {
-    result = gst_pad_alloc_buffer (gstswitch->srcpad, offset, size, caps, buf);
+  return res;
+}
 
-    /* FIXME: HACK. If buffer alloc returns not-linked, perform a fallback
-     * allocation.  This should NOT be necessary, because playbin should
-     * properly block the source pad from running until it's finished hooking 
-     * everything up, but playbin needs refactoring first. */
-    if (result == GST_FLOW_NOT_LINKED) {
-      GST_DEBUG_OBJECT (gstswitch,
-          "No peer pad yet - performing fallback allocation for pad %s:%s",
-          GST_DEBUG_PAD_NAME (pad));
+/* Get or create the active sinkpad */
+static GstPad *
+gst_stream_selector_activate_sinkpad (GstStreamSelector * sel, GstPad * pad)
+{
+  GstPad *active_sinkpad;
+  GstSelectorPad *selpad;
 
-      *buf = NULL;
-      result = GST_FLOW_OK;
-    }
-  }
+  selpad = GST_SELECTOR_PAD_CAST (pad);
 
-  gst_object_unref (gstswitch);
+  GST_OBJECT_LOCK (sel);
+  selpad->active = TRUE;
+  active_sinkpad = sel->active_sinkpad;
+  if (active_sinkpad == NULL) {
+    /* first pad we get an alloc on becomes the activated pad by default */
+    active_sinkpad = sel->active_sinkpad = gst_object_ref (pad);
+    GST_DEBUG_OBJECT (sel, "Activating pad %s:%s", GST_DEBUG_PAD_NAME (pad));
+  }
+  GST_OBJECT_UNLOCK (sel);
 
-  return result;
+  return active_sinkpad;
 }
 
 static GList *
-gst_switch_get_linked_pads (GstPad * pad)
+gst_stream_selector_get_linked_pads (GstPad * pad)
 {
-  GstPad *otherpad = gst_switch_get_linked_pad (pad, TRUE);
+  GstPad *otherpad;
 
+  otherpad = gst_stream_selector_get_linked_pad (pad, TRUE);
   if (!otherpad)
     return NULL;
-
+  /* need to drop the ref, internal linked pads is not MT safe */
+  gst_object_unref (otherpad);
   return g_list_append (NULL, otherpad);
 }
 
-
-/* =========================================== */
-/*                                             */
-/*              Init & Class init              */
-/*                                             */
-/* =========================================== */
-
-static void
-gst_switch_dispose (GObject * object)
-{
-  GstSwitch *gstswitch = NULL;
-
-  gstswitch = GST_SWITCH (object);
-
-  if (gstswitch->switch_mutex) {
-    g_mutex_free (gstswitch->switch_mutex);
-  }
-  if (gstswitch->active_sinkpad) {
-    gst_object_unref (gstswitch->active_sinkpad);
-    gstswitch->active_sinkpad = NULL;
-  }
-  if (gstswitch->newsegment_events) {
-    g_hash_table_destroy (gstswitch->newsegment_events);
-  }
-  if (gstswitch->stored_buffers) {
-    g_hash_table_destroy (gstswitch->stored_buffers);
-  }
-  if (gstswitch->previous_sinkpad) {
-    gst_object_unref (GST_OBJECT (gstswitch->previous_sinkpad));
-    gstswitch->previous_sinkpad = NULL;
-  }
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-unref_buffer (GstBuffer * buf, gpointer user_data)
-{
-  gst_buffer_unref (buf);
-}
-
-static void
-unref_buffers_and_destroy_list (GList * bufferlist)
-{
-  g_list_foreach (bufferlist, (GFunc) unref_buffer, NULL);
-  g_list_free (bufferlist);
-}
-
-static void
-gst_switch_init (GstSwitch * gstswitch)
-{
-  gstswitch->srcpad = gst_pad_new ("src", GST_PAD_SRC);
-  gst_pad_set_internal_link_function (gstswitch->srcpad,
-      GST_DEBUG_FUNCPTR (gst_switch_get_linked_pads));
-  gst_pad_set_getcaps_function (gstswitch->srcpad,
-      GST_DEBUG_FUNCPTR (gst_switch_getcaps));
-  gst_element_add_pad (GST_ELEMENT (gstswitch), gstswitch->srcpad);
-
-  gstswitch->active_sinkpad = NULL;
-  gstswitch->previous_sinkpad = NULL;
-  gstswitch->nb_sinkpads = 0;
-  gstswitch->newsegment_events = g_hash_table_new_full (g_direct_hash,
-      g_direct_equal, NULL, (GDestroyNotify) gst_mini_object_unref);
-  gstswitch->stored_buffers = g_hash_table_new_full (g_direct_hash,
-      g_direct_equal, NULL, (GDestroyNotify) unref_buffers_and_destroy_list);
-  gstswitch->need_to_send_newsegment = FALSE;
-  gstswitch->queue_buffers = FALSE;
-  gstswitch->stop_value = GST_CLOCK_TIME_NONE;
-  gstswitch->start_value = GST_CLOCK_TIME_NONE;
-  gstswitch->current_start = 0;
-  gstswitch->last_ts = GST_CLOCK_TIME_NONE;
-  gstswitch->switch_mutex = g_mutex_new ();
-}
-
-static void
-gst_switch_base_init (gpointer g_class)
+static GstPad *
+gst_stream_selector_request_new_pad (GstElement * element,
+    GstPadTemplate * templ, const gchar * unused)
 {
-  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+  GstStreamSelector *sel;
+  gchar *name = NULL;
+  GstPad *sinkpad = NULL;
 
-  gst_element_class_set_details (element_class, &gst_switch_details);
+  sel = GST_STREAM_SELECTOR (element);
+  g_return_val_if_fail (templ->direction == GST_PAD_SINK, NULL);
+  GST_LOG_OBJECT (sel, "Creating new pad %d", sel->nb_sinkpads);
+  GST_OBJECT_LOCK (sel);
+  name = g_strdup_printf ("sink%d", sel->nb_sinkpads++);
+  sinkpad = g_object_new (GST_TYPE_SELECTOR_PAD,
+      "name", name, "direction", templ->direction, "template", templ, NULL);
+  g_free (name);
+  GST_OBJECT_UNLOCK (sel);
+
+  gst_pad_set_event_function (sinkpad,
+      GST_DEBUG_FUNCPTR (gst_selector_pad_event));
+  gst_pad_set_getcaps_function (sinkpad,
+      GST_DEBUG_FUNCPTR (gst_selector_pad_getcaps));
+  gst_pad_set_chain_function (sinkpad,
+      GST_DEBUG_FUNCPTR (gst_selector_pad_chain));
+  gst_pad_set_internal_link_function (sinkpad,
+      GST_DEBUG_FUNCPTR (gst_selector_pad_get_linked_pads));
+  gst_pad_set_bufferalloc_function (sinkpad,
+      GST_DEBUG_FUNCPTR (gst_selector_pad_bufferalloc));
 
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_switch_sink_factory));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_switch_src_factory));
+  gst_pad_set_active (sinkpad, TRUE);
+  gst_element_add_pad (GST_ELEMENT (sel), sinkpad);
+  return sinkpad;
 }
 
 static void
-gst_switch_class_init (GstSwitchClass * klass)
+gst_stream_selector_release_pad (GstElement * element, GstPad * pad)
 {
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_switch_set_property);
-  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_switch_get_property);
-
-  g_object_class_install_property (gobject_class,
-      ARG_NB_SOURCES,
-      g_param_spec_uint ("num-sources",
-          "number of sources",
-          "number of sources", 0, G_MAXUINT, 0, G_PARAM_READABLE));
-  g_object_class_install_property (gobject_class,
-      ARG_ACTIVE_SOURCE,
-      g_param_spec_string ("active-pad",
-          "Active Pad",
-          "Name of the currently active sink pad", NULL, G_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-      ARG_START_VALUE,
-      g_param_spec_uint64 ("start-value",
-          "Start Value",
-          "Timestamp that next segment will start at (-1 to use first buffer)",
-          0, G_MAXUINT64, GST_CLOCK_TIME_NONE, G_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-      ARG_STOP_VALUE,
-      g_param_spec_uint64 ("stop-value",
-          "Stop Value",
-          "Timestamp that current source will stop at (-1 if unknown or don't care)",
-          0, G_MAXUINT64, GST_CLOCK_TIME_NONE, G_PARAM_READWRITE));
-
-  g_object_class_install_property (gobject_class,
-      ARG_LAST_TS,
-      g_param_spec_uint64 ("last-timestamp",
-          "Time at the end of the last buffer",
-          "Time at the end of the last buffer", 0, G_MAXUINT, 0,
-          G_PARAM_READABLE));
-
-  g_object_class_install_property (gobject_class,
-      ARG_QUEUE_BUFFERS,
-      g_param_spec_boolean ("queue-buffers",
-          "Queue new segment and buffers instead of sending them",
-          "Queue new segment and buffers instead of sending them",
-          FALSE, G_PARAM_READWRITE));
-
-  gobject_class->dispose = gst_switch_dispose;
-
-  gstelement_class->request_new_pad = gst_switch_request_new_pad;
-  gstelement_class->release_pad = gst_switch_release_pad;
-}
-
-/* ============================================================= */
-/*                                                               */
-/*                       Public Methods                          */
-/*                                                               */
-/* ============================================================= */
-
-GType
-gst_switch_get_type (void)
-{
-  static GType switch_type = 0;
-
-  if (!switch_type) {
-    static const GTypeInfo switch_info = {
-      sizeof (GstSwitchClass),
-      gst_switch_base_init,
-      NULL,
-      (GClassInitFunc) gst_switch_class_init,
-      NULL,
-      NULL,
-      sizeof (GstSwitch),
-      0,
-      (GInstanceInitFunc) gst_switch_init,
-    };
+  GstStreamSelector *sel;
 
-    switch_type = g_type_register_static (GST_TYPE_ELEMENT,
-        "GstSwitch", &switch_info, 0);
+  sel = GST_STREAM_SELECTOR (element);
+  GST_LOG_OBJECT (sel, "Releasing pad %s:%s", GST_DEBUG_PAD_NAME (pad));
 
-    GST_DEBUG_CATEGORY_INIT (switch_debug, "switch", 0, "the switch element");
+  GST_OBJECT_LOCK (sel);
+  /* if the pad was the active pad, makes us select a new one */
+  if (sel->active_sinkpad == pad) {
+    GST_DEBUG_OBJECT (sel, "Deactivating pad %s:%s", GST_DEBUG_PAD_NAME (pad));
+    sel->active_sinkpad = NULL;
   }
+  GST_OBJECT_UNLOCK (sel);
 
-  return switch_type;
+  gst_pad_set_active (pad, FALSE);
+  gst_element_remove_pad (GST_ELEMENT (sel), pad);
 }
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
   return gst_element_register (plugin, "switch", GST_RANK_NONE,
-      GST_TYPE_SWITCH);
+      GST_TYPE_STREAM_SELECTOR);
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
diff --git a/gst/switch/gstswitch.h b/gst/switch/gstswitch.h
index c9ca0ec0..a7c4b22f 100644
--- a/gst/switch/gstswitch.h
+++ b/gst/switch/gstswitch.h
@@ -1,5 +1,6 @@
 /* GStreamer
  * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
+ * Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,67 +18,44 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#ifndef __GST_SWITCH_H__
-#define __GST_SWITCH_H__
+#ifndef __GST_STREAM_SELECTOR_H__
+#define __GST_STREAM_SELECTOR_H__
 
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_SWITCH \
-  (gst_switch_get_type())
-#define GST_SWITCH(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_SWITCH, GstSwitch))
-#define GST_SWITCH_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SWITCH, GstSwitchClass))
-#define GST_IS_SWITCH(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_SWITCH))
-#define GST_IS_SWITCH_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_SWITCH))
-
-typedef struct _GstSwitch GstSwitch;
-typedef struct _GstSwitchClass GstSwitchClass;
-
-struct _GstSwitch {
+#define GST_TYPE_STREAM_SELECTOR \
+  (gst_stream_selector_get_type())
+#define GST_STREAM_SELECTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_STREAM_SELECTOR, GstStreamSelector))
+#define GST_STREAM_SELECTOR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_STREAM_SELECTOR, GstStreamSelectorClass))
+#define GST_IS_STREAM_SELECTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_STREAM_SELECTOR))
+#define GST_IS_STREAM_SELECTOR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_STREAM_SELECTOR))
+
+typedef struct _GstStreamSelector GstStreamSelector;
+typedef struct _GstStreamSelectorClass GstStreamSelectorClass;
+
+struct _GstStreamSelector {
   GstElement element;
-  
-  GstPad *active_sinkpad;
+
   GstPad *srcpad;
-  GstPad *previous_sinkpad;
 
+  GstPad *active_sinkpad;
   guint nb_sinkpads;
-  /* this hash table stores for key of the pad pointer
-   * the last new segment event received for this pad
-   * so when switching we can send new segment events
-   */
-  GHashTable *newsegment_events;
-  /* flag to decide whether we need to send a new segment event
-   * before we receive the next buffer */
-  gboolean need_to_send_newsegment;
-  /* flag to decide whether to queue buffers received from current
-   * pads */
-  gboolean queue_buffers;
-  GstClockTime stop_value;
-  GstClockTime start_value;
-  GstClockTime current_start;
-  GstClockTime last_ts;
-  /* this hash tables stores for key of the pad pointer
-   * a GList of stored buffers that need to be sent once the
-   * new segment has been sent
-   */
-  GHashTable *stored_buffers;
-  GMutex *switch_mutex;
-};
 
-#define GST_SWITCH_LOCK(obj) g_mutex_lock(obj->switch_mutex)
-#define GST_SWITCH_UNLOCK(obj) g_mutex_unlock(obj->switch_mutex)
+  GstSegment segment;
+};
 
-struct _GstSwitchClass {
+struct _GstStreamSelectorClass {
   GstElementClass parent_class;
 };
 
-GType gst_switch_get_type (void);
+GType gst_stream_selector_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GST_SWITCH_H__ */
+#endif /* __GST_STREAM_SELECTOR_H__ */