Reorganised the source tree. We now have src/ with a couple of subdirs:

* daemon/ - Contains the files specific to the polypaudio daemon.
 * modules/ - All loadable modules.
 * polyp/ - Files that are part of the public, application interface or
   are only used in libpolyp.
 * polypcore/ - All other shared files.
 * tests/ - Test programs.
 * utils/ - Utility programs.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@487 fefdeb5f-60dc-0310-8127-8f9354f1896f

src/tests/cpulimit-test.c

@@ -0,0 +1,92 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio 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 of the
+  License, or (at your option) any later version.
+ 
+  polypaudio 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
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <sys/time.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+
+#include "../daemon/cpulimit.h"
+#include <polyp/mainloop.h>
+#include <polypcore/gccmacro.h>
+
+#ifdef TEST2
+#include <polyp/mainloop-signal.h>
+#endif
+
+/* A simple example for testing the cpulimit subsystem */
+
+static time_t start;
+
+#ifdef TEST2
+
+static void func(pa_mainloop_api *m, PA_GCC_UNUSED pa_signal_event *e, PA_GCC_UNUSED int sig, PA_GCC_UNUSED void *userdata) {
+    time_t now;
+    time(&now);
+    
+    if ((now - start) >= 30) {
+        m->quit(m, 1);
+        fprintf(stderr, "Test failed\n");
+    } else
+        raise(SIGUSR1);
+}
+
+#endif
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+    pa_mainloop *m;
+    
+    m = pa_mainloop_new();
+    assert(m);
+
+    pa_cpu_limit_init(pa_mainloop_get_api(m));
+
+    time(&start);
+
+#ifdef TEST2
+    pa_signal_init(pa_mainloop_get_api(m));
+    pa_signal_new(SIGUSR1, func, NULL);
+    raise(SIGUSR1);
+    pa_mainloop_run(m, NULL);
+    pa_signal_done();
+#else
+    for (;;) {
+        time_t now;
+        time(&now);
+        
+        if ((now - start) >= 30) {
+            fprintf(stderr, "Test failed\n");
+            break;
+        }
+    }
+#endif
+
+    pa_cpu_limit_done();
+    
+    pa_mainloop_free(m);
+
+    return 0;
+}

src/tests/mainloop-test.c

@@ -0,0 +1,146 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio 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 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio 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
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <assert.h>
+
+#include <polypcore/util.h>
+#include <polypcore/gccmacro.h>
+
+#ifdef GLIB_MAIN_LOOP
+
+#include <glib.h>
+#include <polyp/glib-mainloop.h>
+
+static GMainLoop* glib_main_loop = NULL;
+
+#if GLIB_MAJOR_VERSION >= 2
+#define GLIB20
+#else
+#undef GLIB20
+#endif 
+
+
+#else /* GLIB_MAIN_LOOP */
+#include <polyp/mainloop.h>
+#endif /* GLIB_MAIN_LOOP */
+
+static pa_defer_event *de;
+
+static void iocb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
+    unsigned char c;
+    read(fd, &c, sizeof(c));
+    fprintf(stderr, "IO EVENT: %c\n", c < 32 ? '.' : c);
+    a->defer_enable(de, 1);
+}
+
+static void dcb(pa_mainloop_api*a, pa_defer_event *e, void *userdata) {
+    fprintf(stderr, "DEFER EVENT\n");
+    a->defer_enable(e, 0);
+}
+
+static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {
+    fprintf(stderr, "TIME EVENT\n");
+
+#if defined(GLIB_MAIN_LOOP) && defined(GLIB20)
+    g_main_loop_quit(glib_main_loop);
+#elif defined(GLIB_MAIN_LOOP)
+    g_main_quit(glib_main_loop);
+#else
+    a->quit(a, 0);
+#endif
+}
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+    pa_mainloop_api *a;
+    pa_io_event *ioe;
+    pa_time_event *te;
+    struct timeval tv;
+
+#ifdef GLIB_MAIN_LOOP
+    pa_glib_mainloop *g;
+
+#ifdef GLIB20 
+    glib_main_loop = g_main_loop_new(NULL, FALSE);
+    assert(glib_main_loop);
+
+    g = pa_glib_mainloop_new(NULL);
+#else /* GLIB20 */
+    glib_main_loop = g_main_new(FALSE);
+    assert(glib_main_loop);
+    
+    g = pa_glib_mainloop_new();
+#endif /* GLIB20 */
+    assert(g);
+
+    a = pa_glib_mainloop_get_api(g);
+    assert(a);
+#else /* GLIB_MAIN_LOOP */
+    pa_mainloop *m;
+
+    m = pa_mainloop_new();
+    assert(m);
+
+    a = pa_mainloop_get_api(m);
+    assert(a);
+#endif /* GLIB_MAIN_LOOP */
+
+    ioe = a->io_new(a, 0, PA_IO_EVENT_INPUT, iocb, NULL);
+    assert(ioe);
+
+    de = a->defer_new(a, dcb, NULL);
+    assert(de);
+
+    pa_gettimeofday(&tv);
+    tv.tv_sec += 10;
+    te = a->time_new(a, &tv, tcb, NULL);
+
+#if defined(GLIB_MAIN_LOOP) && defined(GLIB20)
+    g_main_loop_run(glib_main_loop);
+#elif defined(GLIB_MAIN_LOOP)
+    g_main_run(glib_main_loop);
+#else
+    pa_mainloop_run(m, NULL);
+#endif
+
+    a->time_free(te);
+    a->defer_free(de);
+    a->io_free(ioe);
+
+#ifdef GLIB_MAIN_LOOP
+    pa_glib_mainloop_free(g);
+#ifdef GLIB20
+    g_main_loop_unref(glib_main_loop);
+#else
+    g_main_destroy(glib_main_loop);
+#endif
+#else
+    pa_mainloop_free(m);
+#endif
+    
+    return 0;
+}

src/tests/mcalign-test.c

@@ -0,0 +1,96 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio 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.
+ 
+  polypaudio 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 polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include <polypcore/util.h>
+#include <polypcore/mcalign.h>
+#include <polypcore/gccmacro.h>
+
+/* A simple program for testing pa_mcalign */
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+    pa_mcalign *a = pa_mcalign_new(11, NULL);
+    pa_memchunk c;
+
+    pa_memchunk_reset(&c);
+
+    srand(time(NULL));
+
+    for (;;) {
+        ssize_t r;
+        size_t l;
+
+        if (!c.memblock) {
+            c.memblock = pa_memblock_new(2048, NULL);
+            c.index = c.length = 0;
+        }
+
+        assert(c.index < c.memblock->length);
+
+        l = c.memblock->length - c.index;
+
+        l = l <= 1 ? l : rand() % (l-1) +1 ;
+        
+        if ((r = read(STDIN_FILENO, (uint8_t*) c.memblock->data + c.index, l)) <= 0) {
+            fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+            break;
+        }
+
+        c.length = r;
+        pa_mcalign_push(a, &c);
+        fprintf(stderr, "Read %d bytes\n", r);
+
+        c.index += r;
+
+        if (c.index >= c.memblock->length) {
+            pa_memblock_unref(c.memblock);
+            pa_memchunk_reset(&c);
+        }
+
+        for (;;) {
+            pa_memchunk t;
+
+            if (pa_mcalign_pop(a, &t) < 0)
+                break;
+
+            pa_loop_write(STDOUT_FILENO, (uint8_t*) t.memblock->data + t.index, t.length);
+            fprintf(stderr, "Wrote %lu bytes.\n", (unsigned long) t.length);
+
+            pa_memblock_unref(t.memblock);
+        }
+    }
+
+    pa_mcalign_free(a);
+
+    if (c.memblock)
+        pa_memblock_unref(c.memblock);
+}

src/tests/pacat-simple.c

@@ -0,0 +1,101 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio 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 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio 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
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <polyp/polyplib-simple.h>
+#include <polyp/polyplib-error.h>
+#include <polypcore/gccmacro.h>
+
+#define BUFSIZE 1024
+
+int main(PA_GCC_UNUSED int argc, char*argv[]) {
+
+    /* The Sample format to use */
+    static const pa_sample_spec ss = {
+        .format = PA_SAMPLE_S16LE,
+        .rate = 44100,
+        .channels = 2
+    };
+    
+    pa_simple *s = NULL;
+    int ret = 1;
+    int error;
+
+    /* Create a new playback stream */
+    if (!(s = pa_simple_new(NULL, argv[0], PA_STREAM_PLAYBACK, NULL, "playback", &ss, NULL, &error))) {
+        fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(error));
+        goto finish;
+    }
+
+    for (;;) {
+        uint8_t buf[BUFSIZE];
+        ssize_t r;
+
+#if 0
+        pa_usec_t latency;
+
+        if ((latency = pa_simple_get_playback_latency(s, &error)) == (pa_usec_t) -1) {
+            fprintf(stderr, __FILE__": pa_simple_get_playback_latency() failed: %s\n", pa_strerror(error));
+            goto finish;
+        }
+
+        fprintf(stderr, "%0.0f usec    \r", (float)latency);
+#endif
+
+        /* Read some data ... */
+        if ((r = read(STDIN_FILENO, buf, sizeof(buf))) <= 0) {
+            if (r == 0) /* EOF */
+                break;
+            
+            fprintf(stderr, __FILE__": read() failed: %s\n", strerror(errno));
+            goto finish;
+        }
+
+        /* ... and play it */
+        if (pa_simple_write(s, buf, r, &error) < 0) {
+            fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(error));
+            goto finish;
+        }
+    }
+
+    /* Make sure that every single sample was played */
+    if (pa_simple_drain(s, &error) < 0) {
+        fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(error));
+        goto finish;
+    }
+
+    ret = 0;
+
+finish:
+
+    if (s)
+        pa_simple_free(s);
+    
+    return ret;
+}

src/tests/parec-simple.c

@@ -0,0 +1,100 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio 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 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio 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
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <polyp/polyplib-simple.h>
+#include <polyp/polyplib-error.h>
+#include <polypcore/gccmacro.h>
+
+#define BUFSIZE 1024
+
+/* A simple routine calling UNIX write() in a loop */
+static ssize_t loop_write(int fd, const void*data, size_t size) {
+    ssize_t ret = 0;
+
+    while (size > 0) {
+        ssize_t r;
+
+        if ((r = write(fd, data, size)) < 0)
+            return r;
+
+        if (r == 0)
+            break;
+        
+        ret += r;
+        data = (const uint8_t*) data + r;
+        size -= r;
+    }
+
+    return ret;
+}
+
+int main(PA_GCC_UNUSED int argc, char*argv[]) {
+    /* The sample type to use */
+    static const pa_sample_spec ss = {
+        .format = PA_SAMPLE_S16LE,
+        .rate = 44100,
+        .channels = 2
+    };
+    pa_simple *s = NULL;
+    int ret = 1;
+    int error;
+
+    /* Create the recording stream */
+    if (!(s = pa_simple_new(NULL, argv[0], PA_STREAM_RECORD, NULL, "record", &ss, NULL, &error))) {
+        fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(error));
+        goto finish;
+    }
+
+    for (;;) {
+        uint8_t buf[BUFSIZE];
+        ssize_t r;
+
+        /* Record some data ... */
+        if (pa_simple_read(s, buf, sizeof(buf), &error) < 0) {
+            fprintf(stderr, __FILE__": pa_simple_read() failed: %s\n", pa_strerror(error));
+            goto finish;
+        }
+
+        /* And write it to STDOUT */
+        if ((r = loop_write(STDOUT_FILENO, buf, sizeof(buf))) <= 0) {
+            fprintf(stderr, __FILE__": write() failed: %s\n", strerror(errno));
+            goto finish;
+        }
+    }
+
+    ret = 0;
+
+finish:
+
+    if (s)
+        pa_simple_free(s);
+    
+    return ret;
+}

src/tests/strlist-test.c

@@ -0,0 +1,42 @@
+#include <stdio.h>
+
+#include <polypcore/strlist.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char* argv[]) {
+    char *t, *u;
+    pa_strlist *l = NULL;
+
+    l = pa_strlist_prepend(l, "e");
+    l = pa_strlist_prepend(l, "d");
+    l = pa_strlist_prepend(l, "c");
+    l = pa_strlist_prepend(l, "b");
+    l = pa_strlist_prepend(l, "a");
+
+    t = pa_strlist_tostring(l);
+    pa_strlist_free(l);
+    
+    fprintf(stderr, "1: %s\n", t);
+
+    l = pa_strlist_parse(t);
+    pa_xfree(t);
+
+    t = pa_strlist_tostring(l);
+    fprintf(stderr, "2: %s\n", t);
+    pa_xfree(t);
+
+    l = pa_strlist_pop(l, &u);
+    fprintf(stderr, "3: %s\n", u);
+    pa_xfree(u);
+    
+    l = pa_strlist_remove(l, "c");
+    
+    t = pa_strlist_tostring(l);
+    fprintf(stderr, "4: %s\n", t);
+    pa_xfree(t);
+
+    pa_strlist_free(l);
+
+    return 0;
+}

src/tests/voltest.c

@@ -0,0 +1,20 @@
+/* $Id$ */
+
+#include <stdio.h>
+
+#include <polyp/volume.h>
+#include <polypcore/gccmacro.h>
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+    pa_volume_t v;
+
+    for (v = PA_VOLUME_MUTED; v <= PA_VOLUME_NORM*2; v += 256) {
+
+        double dB = pa_sw_volume_to_dB(v);
+        double f = pa_sw_volume_to_linear(v);
+        
+        printf("Volume: %3i; percent: %i%%; decibel %0.2f; linear = %0.2f; volume(decibel): %3i; volume(linear): %3i\n",
+               v, (v*100)/PA_VOLUME_NORM, dB, f, pa_sw_volume_from_dB(dB), pa_sw_volume_from_linear(f));
+
+    }
+}