remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / dynarray.c

diff --git a/src/pulsecore/dynarray.c b/src/pulsecore/dynarray.c
index d1ab116100766f1d46c859134465ebbf31e048b9..b207eca6c2e1b901900973d519775280c1d5ef0a 100644 (file)
--- a/src/pulsecore/dynarray.c
+++ b/src/pulsecore/dynarray.c
@@ -1,18 +1,18 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
- 
+
+  Copyright 2004-2008 Lennart Poettering
+
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   PulseAudio 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
   Lesser General Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -24,80 +24,72 @@
 #endif
 
 #include <string.h>
-#include <assert.h>
 #include <stdlib.h>
 
 #include <pulse/xmalloc.h>
+#include <pulsecore/macro.h>
 
 #include "dynarray.h"
 
-/* If the array becomes to small, increase its size by 100 entries */
-#define INCREASE_BY 100
-
 struct pa_dynarray {
     void **data;
     unsigned n_allocated, n_entries;
+    pa_free_cb_t free_cb;
 };
 
-pa_dynarray* pa_dynarray_new(void) {
-    pa_dynarray *a;
-    a = pa_xnew(pa_dynarray, 1);
-    a->data = NULL;
-    a->n_entries = 0;
-    a->n_allocated = 0;
-    return a;
+pa_dynarray* pa_dynarray_new(pa_free_cb_t free_cb) {
+    pa_dynarray *array;
+
+    array = pa_xnew0(pa_dynarray, 1);
+    array->free_cb = free_cb;
+
+    return array;
 }
 
-void pa_dynarray_free(pa_dynarray* a, void (*func)(void *p, void *userdata), void *userdata) {
+void pa_dynarray_free(pa_dynarray *array) {
     unsigned i;
-    assert(a);
+    pa_assert(array);
 
-    if (func)
-        for (i = 0; i < a->n_entries; i++)
-            if (a->data[i])
-                func(a->data[i], userdata);
+    if (array->free_cb)
+        for (i = 0; i < array->n_entries; i++)
+            array->free_cb(array->data[i]);
 
-    pa_xfree(a->data);
-    pa_xfree(a);
+    pa_xfree(array->data);
+    pa_xfree(array);
 }
 
-void pa_dynarray_put(pa_dynarray*a, unsigned i, void *p) {
-    assert(a);
-
-    if (i >= a->n_allocated) {
-        unsigned n;
+void pa_dynarray_append(pa_dynarray *array, void *p) {
+    pa_assert(array);
+    pa_assert(p);
 
-        if (!p)
-            return;
+    if (array->n_entries == array->n_allocated) {
+        unsigned n = PA_MAX(array->n_allocated * 2, 25U);
 
-        n = i+INCREASE_BY;
-        a->data = pa_xrealloc(a->data, sizeof(void*)*n);
-        memset(a->data+a->n_allocated, 0, sizeof(void*)*(n-a->n_allocated));
-        a->n_allocated = n;
+        array->data = pa_xrealloc(array->data, sizeof(void *) * n);
+        array->n_allocated = n;
     }
 
-    a->data[i] = p;
-
-    if (i >= a->n_entries)
-        a->n_entries = i+1;
+    array->data[array->n_entries++] = p;
 }
 
-unsigned pa_dynarray_append(pa_dynarray*a, void *p) {
-    unsigned i = a->n_entries;
-    pa_dynarray_put(a, i, p);
-    return i;
+void *pa_dynarray_get(pa_dynarray *array, unsigned i) {
+    pa_assert(array);
+    pa_assert(i < array->n_entries);
+
+    return array->data[i];
 }
 
-void *pa_dynarray_get(pa_dynarray*a, unsigned i) {
-    assert(a);
-    if (i >= a->n_allocated)
-        return NULL;
+void *pa_dynarray_steal_last(pa_dynarray *array) {
+    pa_assert(array);
 
-    assert(a->data);
-    return a->data[i];
+    if (array->n_entries > 0)
+        return array->data[--array->n_entries];
+    else
+        return NULL;
 }
 
-unsigned pa_dynarray_size(pa_dynarray*a) {
-    assert(a);
-    return a->n_entries;
+unsigned pa_dynarray_size(pa_dynarray *array) {
+    pa_assert(array);
+
+    return array->n_entries;
 }