camerabin: use private input-selector that still has "select-all" property

The "select-all" property was removed when input-selector was moved
to core, but camerabin uses this, so make camerabin use a private
copy until a better fix is found.

gst/camerabin/Makefile.am

@@ -16,6 +16,7 @@ plugin_LTLIBRARIES = libgstcamerabin.la
 
 libgstcamerabin_la_SOURCES = gstcamerabin.c             \
 			  gstcamerabincolorbalance.c \
+			  gstinputselector.c         \
 			  camerabinimage.c           \
 			  camerabinvideo.c           \
 			  camerabingeneral.c         \
@@ -37,6 +38,7 @@ libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstcamerabin.h             \
 		 gstcamerabincolorbalance.h \
+		 gstinputselector.h         \
 		 camerabinimage.h           \
 		 camerabinvideo.h           \
 		 camerabindebug.h           \

gst/camerabin/camerabingeneral.c

@@ -27,9 +27,10 @@
  *
  */
 #include <string.h>
+#include <glib.h>
 
 #include "camerabingeneral.h"
-#include <glib.h>
+#include "gstinputselector.h"
 
 GST_DEBUG_CATEGORY (gst_camerabin_debug);
 
@@ -128,7 +129,15 @@ gst_camerabin_create_and_add_element (GstBin * bin, const gchar * elem_name)
   g_return_val_if_fail (bin, FALSE);
   g_return_val_if_fail (elem_name, FALSE);
 
-  new_elem = gst_element_factory_make (elem_name, NULL);
+  if (strcmp (elem_name, "input-selector") == 0) {
+    /* we ship our own copy of input-selector because we still use the
+     * "select-all" property which was removed when input-selector was
+     * moved to core */
+    new_elem = g_object_new (GST_TYPE_INPUT_SELECTOR, NULL);
+  } else {
+    new_elem = gst_element_factory_make (elem_name, NULL);
+  }
+
   if (!new_elem) {
     GST_ELEMENT_ERROR (bin, CORE, MISSING_PLUGIN, (NULL),
         ("could not create \"%s\" element.", elem_name));

gst/camerabin/gstcamerabin-marshal.list

@@ -4,3 +4,5 @@
 VOID:INT,INT,INT,INT
 VOID:INT,INT
 BOOLEAN:STRING
+INT64:VOID
+VOID:OBJECT,INT64,INT64

gst/camerabin/gstinputselector.h

@@ -0,0 +1,84 @@
+/* GStreamer
+ * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
+ * Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost@nokia.com>)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
+#ifndef __GST_INPUT_SELECTOR_H__
+#define __GST_INPUT_SELECTOR_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INPUT_SELECTOR \
+  (gst_input_selector_get_type())
+#define GST_INPUT_SELECTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_INPUT_SELECTOR, GstInputSelector))
+#define GST_INPUT_SELECTOR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_INPUT_SELECTOR, GstInputSelectorClass))
+#define GST_IS_INPUT_SELECTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_INPUT_SELECTOR))
+#define GST_IS_INPUT_SELECTOR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_INPUT_SELECTOR))
+
+typedef struct _GstInputSelector GstInputSelector;
+typedef struct _GstInputSelectorClass GstInputSelectorClass;
+
+#define GST_INPUT_SELECTOR_GET_LOCK(sel) (((GstInputSelector*)(sel))->lock)
+#define GST_INPUT_SELECTOR_GET_COND(sel) (((GstInputSelector*)(sel))->cond)
+#define GST_INPUT_SELECTOR_LOCK(sel) (g_mutex_lock (GST_INPUT_SELECTOR_GET_LOCK(sel)))
+#define GST_INPUT_SELECTOR_UNLOCK(sel) (g_mutex_unlock (GST_INPUT_SELECTOR_GET_LOCK(sel)))
+#define GST_INPUT_SELECTOR_WAIT(sel) (g_cond_wait (GST_INPUT_SELECTOR_GET_COND(sel), \
+			GST_INPUT_SELECTOR_GET_LOCK(sel)))
+#define GST_INPUT_SELECTOR_BROADCAST(sel) (g_cond_broadcast (GST_INPUT_SELECTOR_GET_COND(sel)))
+
+struct _GstInputSelector {
+  GstElement element;
+
+  GstPad *srcpad;
+
+  GstPad *active_sinkpad;
+  guint n_pads;
+  guint padcount;
+
+  GstSegment segment;      /* the output segment */
+  gboolean pending_close;  /* if we should push a close first */
+
+  GMutex *lock;
+  GCond *cond;
+  gboolean blocked;
+  gboolean flushing;
+
+  /* select all mode, send data from all input pads forward */
+  gboolean select_all;
+};
+
+struct _GstInputSelectorClass {
+  GstElementClass parent_class;
+
+  gint64 (*block)	(GstInputSelector *self);
+  void (*switch_)	(GstInputSelector *self, GstPad *pad,
+                         gint64 stop_time, gint64 start_time);
+};
+
+GType gst_input_selector_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_INPUT_SELECTOR_H__ */