queuearray: make _find() find the value if no compare function is provided

Allow NULL as compare function for direct value lookup.

https://bugzilla.gnome.org/show_bug.cgi?id=692691

Conflicts:
	plugins/elements/gstqueuearray.c

diff --git a/plugins/elements/gstqueuearray.c b/plugins/elements/gstqueuearray.c
index 174b11498ba22d7a4df45ca8eb242c7e4c388280..17e64187fd889775bf0f1610fb8cd7b2493de79c 100644 (file)
--- a/plugins/elements/gstqueuearray.c
+++ b/plugins/elements/gstqueuearray.c
@@ -193,9 +193,18 @@ gst_queue_array_find (GstQueueArray * array, GCompareFunc func, gpointer data)
 {
   guint i;
 
-  /* Scan from head to tail */
-  for (i = 0; i < array->length; i++)
-    if (func (array->array[(i + array->head) % array->size], data) == 0)
-      return (i + array->head) % array->size;
+  if (func != NULL) {
+    /* Scan from head to tail */
+    for (i = 0; i < array->length; i++) {
+      if (func (array->array[(i + array->head) % array->size], data) == 0)
+        return (i + array->head) % array->size;
+    }
+  } else {
+    for (i = 0; i < array->length; i++) {
+      if (array->array[(i + array->head) % array->size] == data)
+        return (i + array->head) % array->size;
+    }
+  }
+
   return -1;
 }