really create glitch-free branch

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2120 fefdeb5f-60dc-0310-8127-8f9354f1896f

10 files changed, 5771 insertions, 0 deletions

diff --git a/src/utils/Makefile b/src/utils/Makefile
new file mode 120000
index 00000000..c110232d
--- /dev/null
+++ b/src/utils/Makefile
@@ -0,0 +1 @@
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/utils/pabrowse.c b/src/utils/pabrowse.c
new file mode 100644
index 00000000..d88001ef
--- /dev/null
+++ b/src/utils/pabrowse.c
@@ -0,0 +1,156 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <assert.h>
+#include <signal.h>
+
+#include <pulse/pulseaudio.h>
+#include <pulse/browser.h>
+
+static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
+    fprintf(stderr, "Got signal, exiting\n");
+    m->quit(m, 0);
+}
+
+static void dump_server(const pa_browse_info *i) {
+    char t[16];
+
+    if (i->cookie)
+        snprintf(t, sizeof(t), "0x%08x", *i->cookie);
+
+    printf("server: %s\n"
+           "server-version: %s\n"
+           "user-name: %s\n"
+           "fqdn: %s\n"
+           "cookie: %s\n",
+           i->server,
+           i->server_version ? i->server_version : "n/a",
+           i->user_name ? i->user_name : "n/a",
+           i->fqdn ? i->fqdn : "n/a",
+           i->cookie ? t : "n/a");
+}
+
+static void dump_device(const pa_browse_info *i) {
+    char ss[PA_SAMPLE_SPEC_SNPRINT_MAX];
+
+    if (i->sample_spec)
+        pa_sample_spec_snprint(ss, sizeof(ss), i->sample_spec);
+
+    printf("device: %s\n"
+           "description: %s\n"
+           "sample spec: %s\n",
+           i->device,
+           i->description ? i->description : "n/a",
+           i->sample_spec ? ss : "n/a");
+
+}
+
+static void browser_callback(pa_browser *b, pa_browse_opcode_t c, const pa_browse_info *i, void *userdata) {
+    assert(b && i);
+
+    switch (c) {
+
+        case PA_BROWSE_NEW_SERVER:
+            printf("\n=> new server <%s>\n", i->name);
+            dump_server(i);
+            break;
+
+        case PA_BROWSE_NEW_SINK:
+            printf("\n=> new sink <%s>\n", i->name);
+            dump_server(i);
+            dump_device(i);
+            break;
+
+        case PA_BROWSE_NEW_SOURCE:
+            printf("\n=> new source <%s>\n", i->name);
+            dump_server(i);
+            dump_device(i);
+            break;
+
+        case PA_BROWSE_REMOVE_SERVER:
+            printf("\n=> removed server <%s>\n", i->name);
+            break;
+
+        case PA_BROWSE_REMOVE_SINK:
+            printf("\n=> removed sink <%s>\n", i->name);
+            break;
+
+        case PA_BROWSE_REMOVE_SOURCE:
+            printf("\n=> removed source <%s>\n", i->name);
+            break;
+
+        default:
+            ;
+    }
+}
+
+static void error_callback(pa_browser *b, const char *s, void *userdata) {
+    pa_mainloop_api*m = userdata;
+
+    fprintf(stderr, "Failure: %s\n", s);
+    m->quit(m, 1);
+}
+
+int main(int argc, char *argv[]) {
+    pa_mainloop *mainloop = NULL;
+    pa_browser *browser = NULL;
+    int ret = 1, r;
+    const char *s;
+
+    if (!(mainloop = pa_mainloop_new()))
+        goto finish;
+
+    r = pa_signal_init(pa_mainloop_get_api(mainloop));
+    assert(r == 0);
+    pa_signal_new(SIGINT, exit_signal_callback, NULL);
+    pa_signal_new(SIGTERM, exit_signal_callback, NULL);
+    signal(SIGPIPE, SIG_IGN);
+
+    if (!(browser = pa_browser_new_full(pa_mainloop_get_api(mainloop), PA_BROWSE_FOR_SERVERS|PA_BROWSE_FOR_SINKS|PA_BROWSE_FOR_SOURCES, &s))) {
+        fprintf(stderr, "pa_browse_new_full(): %s\n", s);
+        goto finish;
+    }
+
+    pa_browser_set_callback(browser, browser_callback, NULL);
+    pa_browser_set_error_callback(browser, error_callback, pa_mainloop_get_api(mainloop));
+
+    ret = 0;
+    pa_mainloop_run(mainloop, &ret);
+
+finish:
+
+    if (browser)
+        pa_browser_unref(browser);
+
+    if (mainloop) {
+        pa_signal_done();
+        pa_mainloop_free(mainloop);
+    }
+
+    return ret;
+}
diff --git a/src/utils/pacat.c b/src/utils/pacat.c
new file mode 100644
index 00000000..68e308d8
--- /dev/null
+++ b/src/utils/pacat.c
@@ -0,0 +1,769 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
+  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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <fcntl.h>
+
+#include <pulse/pulseaudio.h>
+
+#define TIME_EVENT_USEC 50000
+
+#if PA_API_VERSION < 10
+#error Invalid PulseAudio API version
+#endif
+
+static enum { RECORD, PLAYBACK } mode = PLAYBACK;
+
+static pa_context *context = NULL;
+static pa_stream *stream = NULL;
+static pa_mainloop_api *mainloop_api = NULL;
+
+static void *buffer = NULL;
+static size_t buffer_length = 0, buffer_index = 0;
+
+static pa_io_event* stdio_event = NULL;
+
+static char *stream_name = NULL, *client_name = NULL, *device = NULL;
+
+static int verbose = 0;
+static pa_volume_t volume = PA_VOLUME_NORM;
+
+static pa_sample_spec sample_spec = {
+    .format = PA_SAMPLE_S16LE,
+    .rate = 44100,
+    .channels = 2
+};
+
+static pa_channel_map channel_map;
+static int channel_map_set = 0;
+
+static pa_stream_flags_t flags = 0;
+
+/* A shortcut for terminating the application */
+static void quit(int ret) {
+    assert(mainloop_api);
+    mainloop_api->quit(mainloop_api, ret);
+}
+
+/* Write some data to the stream */
+static void do_stream_write(size_t length) {
+    size_t l;
+    assert(length);
+
+    if (!buffer || !buffer_length)
+        return;
+
+    l = length;
+    if (l > buffer_length)
+        l = buffer_length;
+
+    if (pa_stream_write(stream, (uint8_t*) buffer + buffer_index, l, NULL, 0, PA_SEEK_RELATIVE) < 0) {
+        fprintf(stderr, "pa_stream_write() failed: %s\n", pa_strerror(pa_context_errno(context)));
+        quit(1);
+        return;
+    }
+
+    buffer_length -= l;
+    buffer_index += l;
+
+    if (!buffer_length) {
+        pa_xfree(buffer);
+        buffer = NULL;
+        buffer_index = buffer_length = 0;
+    }
+}
+
+/* This is called whenever new data may be written to the stream */
+static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
+    assert(s);
+    assert(length > 0);
+
+    if (stdio_event)
+        mainloop_api->io_enable(stdio_event, PA_IO_EVENT_INPUT);
+
+    if (!buffer)
+        return;
+
+    do_stream_write(length);
+}
+
+/* This is called whenever new data may is available */
+static void stream_read_callback(pa_stream *s, size_t length, void *userdata) {
+    const void *data;
+    assert(s);
+    assert(length > 0);
+
+    if (stdio_event)
+        mainloop_api->io_enable(stdio_event, PA_IO_EVENT_OUTPUT);
+
+    if (pa_stream_peek(s, &data, &length) < 0) {
+        fprintf(stderr, "pa_stream_peek() failed: %s\n", pa_strerror(pa_context_errno(context)));
+        quit(1);
+        return;
+    }
+
+    assert(data);
+    assert(length > 0);
+
+    if (buffer) {
+        fprintf(stderr, "Buffer overrun, dropping incoming data\n");
+        if (pa_stream_drop(s) < 0) {
+            fprintf(stderr, "pa_stream_drop() failed: %s\n", pa_strerror(pa_context_errno(context)));
+            quit(1);
+        }
+        return;
+    }
+
+    buffer = pa_xmalloc(buffer_length = length);
+    memcpy(buffer, data, length);
+    buffer_index = 0;
+    pa_stream_drop(s);
+}
+
+/* This routine is called whenever the stream state changes */
+static void stream_state_callback(pa_stream *s, void *userdata) {
+    assert(s);
+
+    switch (pa_stream_get_state(s)) {
+        case PA_STREAM_CREATING:
+        case PA_STREAM_TERMINATED:
+            break;
+
+        case PA_STREAM_READY:
+            if (verbose) {
+                const pa_buffer_attr *a;
+                char cmt[PA_CHANNEL_MAP_SNPRINT_MAX], sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
+
+                fprintf(stderr, "Stream successfully created.\n");
+
+                if (!(a = pa_stream_get_buffer_attr(s)))
+                    fprintf(stderr, "pa_stream_get_buffer_attr() failed: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
+                else {
+
+                    if (mode == PLAYBACK)
+                        fprintf(stderr, "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u\n", a->maxlength, a->tlength, a->prebuf, a->minreq);
+                    else {
+                        assert(mode == RECORD);
+                        fprintf(stderr, "Buffer metrics: maxlength=%u, fragsize=%u\n", a->maxlength, a->fragsize);
+                    }
+                }
+
+                fprintf(stderr, "Using sample spec '%s', channel map '%s'.\n",
+                        pa_sample_spec_snprint(sst, sizeof(sst), pa_stream_get_sample_spec(s)),
+                        pa_channel_map_snprint(cmt, sizeof(cmt), pa_stream_get_channel_map(s)));
+
+                fprintf(stderr, "Connected to device %s (%u, %ssuspended).\n",
+                        pa_stream_get_device_name(s),
+                        pa_stream_get_device_index(s),
+                        pa_stream_is_suspended(s) ? "" : "not ");
+            }
+
+            break;
+
+        case PA_STREAM_FAILED:
+        default:
+            fprintf(stderr, "Stream error: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
+            quit(1);
+    }
+}
+
+static void stream_suspended_callback(pa_stream *s, void *userdata) {
+    assert(s);
+
+    if (verbose) {
+        if (pa_stream_is_suspended(s))
+            fprintf(stderr, "Stream device suspended.\n");
+        else
+            fprintf(stderr, "Stream device resumed.\n");
+    }
+}
+
+static void stream_moved_callback(pa_stream *s, void *userdata) {
+    assert(s);
+
+    if (verbose)
+        fprintf(stderr, "Stream moved to device %s (%u, %ssuspended).\n", pa_stream_get_device_name(s), pa_stream_get_device_index(s), pa_stream_is_suspended(s) ? "" : "not ");
+}
+
+/* This is called whenever the context status changes */
+static void context_state_callback(pa_context *c, void *userdata) {
+    assert(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+
+        case PA_CONTEXT_READY: {
+            int r;
+
+            assert(c);
+            assert(!stream);
+
+            if (verbose)
+                fprintf(stderr, "Connection established.\n");
+
+            if (!(stream = pa_stream_new(c, stream_name, &sample_spec, channel_map_set ? &channel_map : NULL))) {
+                fprintf(stderr, "pa_stream_new() failed: %s\n", pa_strerror(pa_context_errno(c)));
+                goto fail;
+            }
+
+            pa_stream_set_state_callback(stream, stream_state_callback, NULL);
+            pa_stream_set_write_callback(stream, stream_write_callback, NULL);
+            pa_stream_set_read_callback(stream, stream_read_callback, NULL);
+            pa_stream_set_suspended_callback(stream, stream_suspended_callback, NULL);
+            pa_stream_set_moved_callback(stream, stream_moved_callback, NULL);
+
+            if (mode == PLAYBACK) {
+                pa_cvolume cv;
+                if ((r = pa_stream_connect_playback(stream, device, NULL, flags, pa_cvolume_set(&cv, sample_spec.channels, volume), NULL)) < 0) {
+                    fprintf(stderr, "pa_stream_connect_playback() failed: %s\n", pa_strerror(pa_context_errno(c)));
+                    goto fail;
+                }
+
+            } else {
+                if ((r = pa_stream_connect_record(stream, device, NULL, flags)) < 0) {
+                    fprintf(stderr, "pa_stream_connect_record() failed: %s\n", pa_strerror(pa_context_errno(c)));
+                    goto fail;
+                }
+            }
+
+            break;
+        }
+
+        case PA_CONTEXT_TERMINATED:
+            quit(0);
+            break;
+
+        case PA_CONTEXT_FAILED:
+        default:
+            fprintf(stderr, "Connection failure: %s\n", pa_strerror(pa_context_errno(c)));
+            goto fail;
+    }
+
+    return;
+
+fail:
+    quit(1);
+
+}
+
+/* Connection draining complete */
+static void context_drain_complete(pa_context*c, void *userdata) {
+    pa_context_disconnect(c);
+}
+
+/* Stream draining complete */
+static void stream_drain_complete(pa_stream*s, int success, void *userdata) {
+    pa_operation *o;
+
+    if (!success) {
+        fprintf(stderr, "Failed to drain stream: %s\n", pa_strerror(pa_context_errno(context)));
+        quit(1);
+    }
+
+    if (verbose)
+        fprintf(stderr, "Playback stream drained.\n");
+
+    pa_stream_disconnect(stream);
+    pa_stream_unref(stream);
+    stream = NULL;
+
+    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
+        pa_context_disconnect(context);
+    else {
+        if (verbose)
+            fprintf(stderr, "Draining connection to server.\n");
+    }
+}
+
+/* New data on STDIN **/
+static void stdin_callback(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
+    size_t l, w = 0;
+    ssize_t r;
+
+    assert(a == mainloop_api);
+    assert(e);
+    assert(stdio_event == e);
+
+    if (buffer) {
+        mainloop_api->io_enable(stdio_event, PA_IO_EVENT_NULL);
+        return;
+    }
+
+    if (!stream || pa_stream_get_state(stream) != PA_STREAM_READY || !(l = w = pa_stream_writable_size(stream)))
+        l = 4096;
+
+    buffer = pa_xmalloc(l);
+
+    if ((r = read(fd, buffer, l)) <= 0) {
+        if (r == 0) {
+            if (verbose)
+                fprintf(stderr, "Got EOF.\n");
+
+            if (stream) {
+                pa_operation *o;
+
+                if (!(o = pa_stream_drain(stream, stream_drain_complete, NULL))) {
+                    fprintf(stderr, "pa_stream_drain(): %s\n", pa_strerror(pa_context_errno(context)));
+                    quit(1);
+                    return;
+                }
+
+                pa_operation_unref(o);
+            } else
+                quit(0);
+
+        } else {
+            fprintf(stderr, "read() failed: %s\n", strerror(errno));
+            quit(1);
+        }
+
+        mainloop_api->io_free(stdio_event);
+        stdio_event = NULL;
+        return;
+    }
+
+    buffer_length = r;
+    buffer_index = 0;
+
+    if (w)
+        do_stream_write(w);
+}
+
+/* Some data may be written to STDOUT */
+static void stdout_callback(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
+    ssize_t r;
+
+    assert(a == mainloop_api);
+    assert(e);
+    assert(stdio_event == e);
+
+    if (!buffer) {
+        mainloop_api->io_enable(stdio_event, PA_IO_EVENT_NULL);
+        return;
+    }
+
+    assert(buffer_length);
+
+    if ((r = write(fd, (uint8_t*) buffer+buffer_index, buffer_length)) <= 0) {
+        fprintf(stderr, "write() failed: %s\n", strerror(errno));
+        quit(1);
+
+        mainloop_api->io_free(stdio_event);
+        stdio_event = NULL;
+        return;
+    }
+
+    buffer_length -= r;
+    buffer_index += r;
+
+    if (!buffer_length) {
+        pa_xfree(buffer);
+        buffer = NULL;
+        buffer_length = buffer_index = 0;
+    }
+}
+
+/* UNIX signal to quit recieved */
+static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
+    if (verbose)
+        fprintf(stderr, "Got signal, exiting.\n");
+    quit(0);
+}
+
+/* Show the current latency */
+static void stream_update_timing_callback(pa_stream *s, int success, void *userdata) {
+    pa_usec_t latency, usec;
+    int negative = 0;
+
+    assert(s);
+
+    if (!success ||
+        pa_stream_get_time(s, &usec) < 0 ||
+        pa_stream_get_latency(s, &latency, &negative) < 0) {
+        fprintf(stderr, "Failed to get latency: %s\n", pa_strerror(pa_context_errno(context)));
+        quit(1);
+        return;
+    }
+
+    fprintf(stderr, "Time: %0.3f sec; Latency: %0.0f usec.  \r",
+            (float) usec / 1000000,
+            (float) latency * (negative?-1:1));
+}
+
+/* Someone requested that the latency is shown */
+static void sigusr1_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
+
+    if (!stream)
+        return;
+
+    pa_operation_unref(pa_stream_update_timing_info(stream, stream_update_timing_callback, NULL));
+}
+
+static void time_event_callback(pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata) {
+    struct timeval next;
+
+    if (stream && pa_stream_get_state(stream) == PA_STREAM_READY) {
+        pa_operation *o;
+        if (!(o = pa_stream_update_timing_info(stream, stream_update_timing_callback, NULL)))
+            fprintf(stderr, "pa_stream_update_timing_info() failed: %s\n", pa_strerror(pa_context_errno(context)));
+        else
+            pa_operation_unref(o);
+    }
+
+    pa_gettimeofday(&next);
+    pa_timeval_add(&next, TIME_EVENT_USEC);
+
+    m->time_restart(e, &next);
+}
+
+static void help(const char *argv0) {
+
+    printf("%s [options]\n\n"
+           "  -h, --help                            Show this help\n"
+           "      --version                         Show version\n\n"
+           "  -r, --record                          Create a connection for recording\n"
+           "  -p, --playback                        Create a connection for playback\n\n"
+           "  -v, --verbose                         Enable verbose operations\n\n"
+           "  -s, --server=SERVER                   The name of the server to connect to\n"
+           "  -d, --device=DEVICE                   The name of the sink/source to connect to\n"
+           "  -n, --client-name=NAME                How to call this client on the server\n"
+           "      --stream-name=NAME                How to call this stream on the server\n"
+           "      --volume=VOLUME                   Specify the initial (linear) volume in range 0...65536\n"
+           "      --rate=SAMPLERATE                 The sample rate in Hz (defaults to 44100)\n"
+           "      --format=SAMPLEFORMAT             The sample type, one of s16le, s16be, u8, float32le,\n"
+           "                                        float32be, ulaw, alaw (defaults to s16ne)\n"
+           "      --channels=CHANNELS               The number of channels, 1 for mono, 2 for stereo\n"
+           "                                        (defaults to 2)\n"
+           "      --channel-map=CHANNELMAP          Channel map to use instead of the default\n"
+           "      --fix-format                      Take the sample format from the sink the stream is\n"
+           "                                        being connected to.\n"
+           "      --fix-rate                        Take the sampling rate from the sink the stream is\n"
+           "                                        being connected to.\n"
+           "      --fix-channels                    Take the number of channels and the channel map\n"
+           "                                        from the sink the stream is being connected to.\n"
+           "      --no-remix                        Don't upmix or downmix channels.\n"
+           "      --no-remap                        Map channels by index instead of name.\n"
+           ,
+           argv0);
+}
+
+enum {
+    ARG_VERSION = 256,
+    ARG_STREAM_NAME,
+    ARG_VOLUME,
+    ARG_SAMPLERATE,
+    ARG_SAMPLEFORMAT,
+    ARG_CHANNELS,
+    ARG_CHANNELMAP,
+    ARG_FIX_FORMAT,
+    ARG_FIX_RATE,
+    ARG_FIX_CHANNELS,
+    ARG_NO_REMAP,
+    ARG_NO_REMIX
+};
+
+int main(int argc, char *argv[]) {
+    pa_mainloop* m = NULL;
+    int ret = 1, r, c;
+    char *bn, *server = NULL;
+    pa_time_event *time_event = NULL;
+
+    static const struct option long_options[] = {
+        {"record",      0, NULL, 'r'},
+        {"playback",    0, NULL, 'p'},
+        {"device",      1, NULL, 'd'},
+        {"server",      1, NULL, 's'},
+        {"client-name", 1, NULL, 'n'},
+        {"stream-name", 1, NULL, ARG_STREAM_NAME},
+        {"version",     0, NULL, ARG_VERSION},
+        {"help",        0, NULL, 'h'},
+        {"verbose",     0, NULL, 'v'},
+        {"volume",      1, NULL, ARG_VOLUME},
+        {"rate",        1, NULL, ARG_SAMPLERATE},
+        {"format",      1, NULL, ARG_SAMPLEFORMAT},
+        {"channels",    1, NULL, ARG_CHANNELS},
+        {"channel-map", 1, NULL, ARG_CHANNELMAP},
+        {"fix-format",  0, NULL, ARG_FIX_FORMAT},
+        {"fix-rate",    0, NULL, ARG_FIX_RATE},
+        {"fix-channels",0, NULL, ARG_FIX_CHANNELS},
+        {"no-remap",    0, NULL, ARG_NO_REMAP},
+        {"no-remix",    0, NULL, ARG_NO_REMIX},
+        {NULL,          0, NULL, 0}
+    };
+
+    if (!(bn = strrchr(argv[0], '/')))
+        bn = argv[0];
+    else
+        bn++;
+
+    if (strstr(bn, "rec") || strstr(bn, "mon"))
+        mode = RECORD;
+    else if (strstr(bn, "cat") || strstr(bn, "play"))
+        mode = PLAYBACK;
+
+    while ((c = getopt_long(argc, argv, "rpd:s:n:hv", long_options, NULL)) != -1) {
+
+        switch (c) {
+            case 'h' :
+                help(bn);
+                ret = 0;
+                goto quit;
+
+            case ARG_VERSION:
+                printf("pacat "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
+                ret = 0;
+                goto quit;
+
+            case 'r':
+                mode = RECORD;
+                break;
+
+            case 'p':
+                mode = PLAYBACK;
+                break;
+
+            case 'd':
+                pa_xfree(device);
+                device = pa_xstrdup(optarg);
+                break;
+
+            case 's':
+                pa_xfree(server);
+                server = pa_xstrdup(optarg);
+                break;
+
+            case 'n':
+                pa_xfree(client_name);
+                client_name = pa_xstrdup(optarg);
+                break;
+
+            case ARG_STREAM_NAME:
+                pa_xfree(stream_name);
+                stream_name = pa_xstrdup(optarg);
+                break;
+
+            case 'v':
+                verbose = 1;
+                break;
+
+            case ARG_VOLUME: {
+                int v = atoi(optarg);
+                volume = v < 0 ? 0 : v;
+                break;
+            }
+
+            case ARG_CHANNELS:
+                sample_spec.channels = atoi(optarg);
+                break;
+
+            case ARG_SAMPLEFORMAT:
+                sample_spec.format = pa_parse_sample_format(optarg);
+                break;
+
+            case ARG_SAMPLERATE:
+                sample_spec.rate = atoi(optarg);
+                break;
+
+            case ARG_CHANNELMAP:
+                if (!pa_channel_map_parse(&channel_map, optarg)) {
+                    fprintf(stderr, "Invalid channel map\n");
+                    goto quit;
+                }
+
+                channel_map_set = 1;
+                break;
+
+            case ARG_FIX_CHANNELS:
+                flags |= PA_STREAM_FIX_CHANNELS;
+                break;
+
+            case ARG_FIX_RATE:
+                flags |= PA_STREAM_FIX_RATE;
+                break;
+
+            case ARG_FIX_FORMAT:
+                flags |= PA_STREAM_FIX_FORMAT;
+                break;
+
+            case ARG_NO_REMIX:
+                flags |= PA_STREAM_NO_REMIX_CHANNELS;
+                break;
+
+            case ARG_NO_REMAP:
+                flags |= PA_STREAM_NO_REMAP_CHANNELS;
+                break;
+
+            default:
+                goto quit;
+        }
+    }
+
+    if (!pa_sample_spec_valid(&sample_spec)) {
+        fprintf(stderr, "Invalid sample specification\n");
+        goto quit;
+    }
+
+    if (channel_map_set && channel_map.channels != sample_spec.channels) {
+        fprintf(stderr, "Channel map doesn't match sample specification\n");
+        goto quit;
+    }
+
+    if (verbose) {
+        char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
+        pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
+        fprintf(stderr, "Opening a %s stream with sample specification '%s'.\n", mode == RECORD ? "recording" : "playback", t);
+    }
+
+    if (!(optind >= argc)) {
+        if (optind+1 == argc) {
+            int fd;
+
+            if ((fd = open(argv[optind], mode == PLAYBACK ? O_RDONLY : O_WRONLY|O_TRUNC|O_CREAT, 0666)) < 0) {
+                fprintf(stderr, "open(): %s\n", strerror(errno));
+                goto quit;
+            }
+
+            if (dup2(fd, mode == PLAYBACK ? 0 : 1) < 0) {
+                fprintf(stderr, "dup2(): %s\n", strerror(errno));
+                goto quit;
+            }
+
+            close(fd);
+
+            if (!stream_name)
+                stream_name = pa_xstrdup(argv[optind]);
+
+        } else {
+            fprintf(stderr, "Too many arguments.\n");
+            goto quit;
+        }
+    }
+
+    if (!client_name)
+        client_name = pa_xstrdup(bn);
+
+    if (!stream_name)
+        stream_name = pa_xstrdup(client_name);
+
+    /* Set up a new main loop */
+    if (!(m = pa_mainloop_new())) {
+        fprintf(stderr, "pa_mainloop_new() failed.\n");
+        goto quit;
+    }
+
+    mainloop_api = pa_mainloop_get_api(m);
+
+    r = pa_signal_init(mainloop_api);
+    assert(r == 0);
+    pa_signal_new(SIGINT, exit_signal_callback, NULL);
+    pa_signal_new(SIGTERM, exit_signal_callback, NULL);
+#ifdef SIGUSR1
+    pa_signal_new(SIGUSR1, sigusr1_signal_callback, NULL);
+#endif
+#ifdef SIGPIPE
+    signal(SIGPIPE, SIG_IGN);
+#endif
+
+    if (!(stdio_event = mainloop_api->io_new(mainloop_api,
+                                             mode == PLAYBACK ? STDIN_FILENO : STDOUT_FILENO,
+                                             mode == PLAYBACK ? PA_IO_EVENT_INPUT : PA_IO_EVENT_OUTPUT,
+                                             mode == PLAYBACK ? stdin_callback : stdout_callback, NULL))) {
+        fprintf(stderr, "io_new() failed.\n");
+        goto quit;
+    }
+
+    /* Create a new connection context */
+    if (!(context = pa_context_new(mainloop_api, client_name))) {
+        fprintf(stderr, "pa_context_new() failed.\n");
+        goto quit;
+    }
+
+    pa_context_set_state_callback(context, context_state_callback, NULL);
+
+    /* Connect the context */
+    pa_context_connect(context, server, 0, NULL);
+
+    if (verbose) {
+        struct timeval tv;
+
+        pa_gettimeofday(&tv);
+        pa_timeval_add(&tv, TIME_EVENT_USEC);
+
+        if (!(time_event = mainloop_api->time_new(mainloop_api, &tv, time_event_callback, NULL))) {
+            fprintf(stderr, "time_new() failed.\n");
+            goto quit;
+        }
+    }
+
+    /* Run the main loop */
+    if (pa_mainloop_run(m, &ret) < 0) {
+        fprintf(stderr, "pa_mainloop_run() failed.\n");
+        goto quit;
+    }
+
+quit:
+    if (stream)
+        pa_stream_unref(stream);
+
+    if (context)
+        pa_context_unref(context);
+
+    if (stdio_event) {
+        assert(mainloop_api);
+        mainloop_api->io_free(stdio_event);
+    }
+
+    if (time_event) {
+        assert(mainloop_api);
+        mainloop_api->time_free(time_event);
+    }
+
+    if (m) {
+        pa_signal_done();
+        pa_mainloop_free(m);
+    }
+
+    pa_xfree(buffer);
+
+    pa_xfree(server);
+    pa_xfree(device);
+    pa_xfree(client_name);
+    pa_xfree(stream_name);
+
+    return ret;
+}
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
new file mode 100644
index 00000000..daa6a96e
--- /dev/null
+++ b/src/utils/pacmd.c
@@ -0,0 +1,188 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <signal.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/un.h>
+
+#include <pulse/error.h>
+#include <pulse/util.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/pid.h>
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
+    pid_t pid ;
+    int fd = -1;
+    int ret = 1, i;
+    struct sockaddr_un sa;
+    char ibuf[256], obuf[256];
+    size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
+    fd_set ifds, ofds;
+
+    if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) {
+        pa_log("no PulseAudio daemon running");
+        goto fail;
+    }
+
+    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+        pa_log("socket(PF_UNIX, SOCK_STREAM, 0): %s", strerror(errno));
+        goto fail;
+    }
+
+    memset(&sa, 0, sizeof(sa));
+    sa.sun_family = AF_UNIX;
+    pa_runtime_path("cli", sa.sun_path, sizeof(sa.sun_path));
+
+    for (i = 0; i < 5; i++) {
+        int r;
+
+        if ((r = connect(fd, (struct sockaddr*) &sa, sizeof(sa))) < 0 && (errno != ECONNREFUSED && errno != ENOENT)) {
+            pa_log("connect(): %s", strerror(errno));
+            goto fail;
+        }
+
+        if (r >= 0)
+            break;
+
+        if (pa_pid_file_kill(SIGUSR2, NULL, "pulseaudio") < 0) {
+            pa_log("failed to kill PulseAudio daemon.");
+            goto fail;
+        }
+
+        pa_msleep(300);
+    }
+
+    if (i >= 5) {
+        pa_log("daemon not responding.");
+        goto fail;
+    }
+
+    ibuf_index = ibuf_length = obuf_index = obuf_length = 0;
+
+
+    FD_ZERO(&ifds);
+    FD_SET(0, &ifds);
+    FD_SET(fd, &ifds);
+
+    FD_ZERO(&ofds);
+
+    for (;;) {
+        if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
+            pa_log("select(): %s", strerror(errno));
+            goto fail;
+        }
+
+        if (FD_ISSET(0, &ifds)) {
+            ssize_t r;
+            assert(!ibuf_length);
+
+            if ((r = read(0, ibuf, sizeof(ibuf))) <= 0) {
+                if (r == 0)
+                    break;
+
+                pa_log("read(): %s", strerror(errno));
+                goto fail;
+            }
+
+            ibuf_length = (size_t) r;
+            ibuf_index = 0;
+        }
+
+        if (FD_ISSET(fd, &ifds)) {
+            ssize_t r;
+            assert(!obuf_length);
+
+            if ((r = read(fd, obuf, sizeof(obuf))) <= 0) {
+                if (r == 0)
+                    break;
+
+                pa_log("read(): %s", strerror(errno));
+                goto fail;
+            }
+
+            obuf_length = (size_t) r;
+            obuf_index = 0;
+        }
+
+        if (FD_ISSET(1, &ofds)) {
+            ssize_t r;
+            assert(obuf_length);
+
+            if ((r = write(1, obuf + obuf_index, obuf_length)) < 0) {
+                pa_log("write(): %s", strerror(errno));
+                goto fail;
+            }
+
+            obuf_length -= (size_t) r;
+            obuf_index += obuf_index;
+
+        }
+
+        if (FD_ISSET(fd, &ofds)) {
+            ssize_t r;
+            assert(ibuf_length);
+
+            if ((r = write(fd, ibuf + ibuf_index, ibuf_length)) < 0) {
+                pa_log("write(): %s", strerror(errno));
+                goto fail;
+            }
+
+            ibuf_length -= (size_t) r;
+            ibuf_index += obuf_index;
+
+        }
+
+        FD_ZERO(&ifds);
+        FD_ZERO(&ofds);
+
+        if (obuf_length <= 0)
+            FD_SET(fd, &ifds);
+        else
+            FD_SET(1, &ofds);
+
+        if (ibuf_length <= 0)
+            FD_SET(0, &ifds);
+        else
+            FD_SET(fd, &ofds);
+    }
+
+
+    ret = 0;
+
+fail:
+    if (fd >= 0)
+        close(fd);
+
+    return ret;
+}
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
new file mode 100644
index 00000000..4381d9d2
--- /dev/null
+++ b/src/utils/pactl.c
@@ -0,0 +1,930 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <getopt.h>
+
+#include <sndfile.h>
+
+#include <pulse/pulseaudio.h>
+#include <pulsecore/core-util.h>
+
+#if PA_API_VERSION < 10
+#error Invalid PulseAudio API version
+#endif
+
+#define BUFSIZE 1024
+
+static pa_context *context = NULL;
+static pa_mainloop_api *mainloop_api = NULL;
+
+static char *device = NULL, *sample_name = NULL, *sink_name = NULL, *source_name = NULL, *module_name = NULL, *module_args = NULL;
+static uint32_t sink_input_idx = PA_INVALID_INDEX, source_output_idx = PA_INVALID_INDEX;
+static uint32_t module_index;
+static int suspend;
+
+static SNDFILE *sndfile = NULL;
+static pa_stream *sample_stream = NULL;
+static pa_sample_spec sample_spec;
+static size_t sample_length = 0;
+
+static int actions = 1;
+
+static int nl = 0;
+
+static enum {
+    NONE,
+    EXIT,
+    STAT,
+    UPLOAD_SAMPLE,
+    PLAY_SAMPLE,
+    REMOVE_SAMPLE,
+    LIST,
+    MOVE_SINK_INPUT,
+    MOVE_SOURCE_OUTPUT,
+    LOAD_MODULE,
+    UNLOAD_MODULE,
+    SUSPEND_SINK,
+    SUSPEND_SOURCE,
+} action = NONE;
+
+static void quit(int ret) {
+    assert(mainloop_api);
+    mainloop_api->quit(mainloop_api, ret);
+}
+
+
+static void context_drain_complete(pa_context *c, void *userdata) {
+    pa_context_disconnect(c);
+}
+
+static void drain(void) {
+    pa_operation *o;
+    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
+        pa_context_disconnect(context);
+    else
+        pa_operation_unref(o);
+}
+
+
+static void complete_action(void) {
+    assert(actions > 0);
+
+    if (!(--actions))
+        drain();
+}
+
+static void stat_callback(pa_context *c, const pa_stat_info *i, void *userdata) {
+    char s[128];
+    if (!i) {
+        fprintf(stderr, "Failed to get statistics: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    pa_bytes_snprint(s, sizeof(s), i->memblock_total_size);
+    printf("Currently in use: %u blocks containing %s bytes total.\n", i->memblock_total, s);
+
+    pa_bytes_snprint(s, sizeof(s), i->memblock_allocated_size);
+    printf("Allocated during whole lifetime: %u blocks containing %s bytes total.\n", i->memblock_allocated, s);
+
+    pa_bytes_snprint(s, sizeof(s), i->scache_size);
+    printf("Sample cache size: %s\n", s);
+
+    complete_action();
+}
+
+static void get_server_info_callback(pa_context *c, const pa_server_info *i, void *useerdata) {
+    char s[PA_SAMPLE_SPEC_SNPRINT_MAX];
+
+    if (!i) {
+        fprintf(stderr, "Failed to get server information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec);
+
+    printf("User name: %s\n"
+           "Host Name: %s\n"
+           "Server Name: %s\n"
+           "Server Version: %s\n"
+           "Default Sample Specification: %s\n"
+           "Default Sink: %s\n"
+           "Default Source: %s\n"
+           "Cookie: %08x\n",
+           i->user_name,
+           i->host_name,
+           i->server_name,
+           i->server_version,
+           s,
+           i->default_sink_name,
+           i->default_source_name,
+           i->cookie);
+
+    complete_action();
+}
+
+static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_last, void *userdata) {
+    char s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get sink information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+    printf("*** Sink #%u ***\n"
+           "Name: %s\n"
+           "Driver: %s\n"
+           "Description: %s\n"
+           "Sample Specification: %s\n"
+           "Channel Map: %s\n"
+           "Owner Module: %u\n"
+           "Volume: %s\n"
+           "Monitor Source: %u\n"
+           "Latency: %0.0f usec\n"
+           "Flags: %s%s%s\n",
+           i->index,
+           i->name,
+           i->driver,
+           i->description,
+           pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
+           pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
+           i->owner_module,
+           i->mute ? "muted" : pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
+           i->monitor_source,
+           (double) i->latency,
+           i->flags & PA_SINK_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "",
+           i->flags & PA_SINK_LATENCY ? "LATENCY " : "",
+           i->flags & PA_SINK_HARDWARE ? "HARDWARE" : "");
+
+}
+
+static void get_source_info_callback(pa_context *c, const pa_source_info *i, int is_last, void *userdata) {
+    char s[PA_SAMPLE_SPEC_SNPRINT_MAX], t[32], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get source information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+    snprintf(t, sizeof(t), "%u", i->monitor_of_sink);
+
+    printf("*** Source #%u ***\n"
+           "Name: %s\n"
+           "Driver: %s\n"
+           "Description: %s\n"
+           "Sample Specification: %s\n"
+           "Channel Map: %s\n"
+           "Owner Module: %u\n"
+           "Volume: %s\n"
+           "Monitor of Sink: %s\n"
+           "Latency: %0.0f usec\n"
+           "Flags: %s%s%s\n",
+           i->index,
+           i->name,
+           i->driver,
+           i->description,
+           pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
+           pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
+           i->owner_module,
+           i->mute ? "muted" : pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
+           i->monitor_of_sink != PA_INVALID_INDEX ? t : "no",
+           (double) i->latency,
+           i->flags & PA_SOURCE_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "",
+           i->flags & PA_SOURCE_LATENCY ? "LATENCY " : "",
+           i->flags & PA_SOURCE_HARDWARE ? "HARDWARE" : "");
+
+}
+
+static void get_module_info_callback(pa_context *c, const pa_module_info *i, int is_last, void *userdata) {
+    char t[32];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get module information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+    snprintf(t, sizeof(t), "%u", i->n_used);
+
+    printf("*** Module #%u ***\n"
+           "Name: %s\n"
+           "Argument: %s\n"
+           "Usage counter: %s\n"
+           "Auto unload: %s\n",
+           i->index,
+           i->name,
+           i->argument ? i->argument : "",
+           i->n_used != PA_INVALID_INDEX ? t : "n/a",
+           i->auto_unload ? "yes" : "no");
+}
+
+static void get_client_info_callback(pa_context *c, const pa_client_info *i, int is_last, void *userdata) {
+    char t[32];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get client information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+    snprintf(t, sizeof(t), "%u", i->owner_module);
+
+    printf("*** Client #%u ***\n"
+           "Name: %s\n"
+           "Driver: %s\n"
+           "Owner Module: %s\n",
+           i->index,
+           i->name,
+           i->driver,
+           i->owner_module != PA_INVALID_INDEX ? t : "n/a");
+}
+
+static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info *i, int is_last, void *userdata) {
+    char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get sink input information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+    snprintf(t, sizeof(t), "%u", i->owner_module);
+    snprintf(k, sizeof(k), "%u", i->client);
+
+    printf("*** Sink Input #%u ***\n"
+           "Name: %s\n"
+           "Driver: %s\n"
+           "Owner Module: %s\n"
+           "Client: %s\n"
+           "Sink: %u\n"
+           "Sample Specification: %s\n"
+           "Channel Map: %s\n"
+           "Volume: %s\n"
+           "Buffer Latency: %0.0f usec\n"
+           "Sink Latency: %0.0f usec\n"
+           "Resample method: %s\n",
+           i->index,
+           i->name,
+           i->driver,
+           i->owner_module != PA_INVALID_INDEX ? t : "n/a",
+           i->client != PA_INVALID_INDEX ? k : "n/a",
+           i->sink,
+           pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
+           pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
+           i->mute ? "muted" : pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
+           (double) i->buffer_usec,
+           (double) i->sink_usec,
+           i->resample_method ? i->resample_method : "n/a");
+}
+
+
+static void get_source_output_info_callback(pa_context *c, const pa_source_output_info *i, int is_last, void *userdata) {
+    char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get source output information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+
+    snprintf(t, sizeof(t), "%u", i->owner_module);
+    snprintf(k, sizeof(k), "%u", i->client);
+
+    printf("*** Source Output #%u ***\n"
+           "Name: %s\n"
+           "Driver: %s\n"
+           "Owner Module: %s\n"
+           "Client: %s\n"
+           "Source: %u\n"
+           "Sample Specification: %s\n"
+           "Channel Map: %s\n"
+           "Buffer Latency: %0.0f usec\n"
+           "Source Latency: %0.0f usec\n"
+           "Resample method: %s\n",
+           i->index,
+           i->name,
+           i->driver,
+           i->owner_module != PA_INVALID_INDEX ? t : "n/a",
+           i->client != PA_INVALID_INDEX ? k : "n/a",
+           i->source,
+           pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
+           pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
+           (double) i->buffer_usec,
+           (double) i->source_usec,
+           i->resample_method ? i->resample_method : "n/a");
+}
+
+static void get_sample_info_callback(pa_context *c, const pa_sample_info *i, int is_last, void *userdata) {
+    char t[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get sample information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+
+    pa_bytes_snprint(t, sizeof(t), i->bytes);
+
+    printf("*** Sample #%u ***\n"
+           "Name: %s\n"
+           "Volume: %s\n"
+           "Sample Specification: %s\n"
+           "Channel Map: %s\n"
+           "Duration: %0.1fs\n"
+           "Size: %s\n"
+           "Lazy: %s\n"
+           "Filename: %s\n",
+           i->index,
+           i->name,
+           pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
+           pa_sample_spec_valid(&i->sample_spec) ? pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec) : "n/a",
+           pa_sample_spec_valid(&i->sample_spec) ? pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map) : "n/a",
+           (double) i->duration/1000000,
+           t,
+           i->lazy ? "yes" : "no",
+           i->filename ? i->filename : "n/a");
+}
+
+static void get_autoload_info_callback(pa_context *c, const pa_autoload_info *i, int is_last, void *userdata) {
+    if (is_last < 0) {
+        fprintf(stderr, "Failed to get autoload information: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last) {
+        complete_action();
+        return;
+    }
+
+    assert(i);
+
+    if (nl)
+        printf("\n");
+    nl = 1;
+
+    printf("*** Autoload Entry #%u ***\n"
+           "Name: %s\n"
+           "Type: %s\n"
+           "Module: %s\n"
+           "Argument: %s\n",
+           i->index,
+           i->name,
+           i->type == PA_AUTOLOAD_SINK ? "sink" : "source",
+           i->module,
+           i->argument);
+}
+
+static void simple_callback(pa_context *c, int success, void *userdata) {
+    if (!success) {
+        fprintf(stderr, "Failure: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    complete_action();
+}
+
+static void index_callback(pa_context *c, uint32_t idx, void *userdata) {
+    if (idx == PA_INVALID_INDEX) {
+        fprintf(stderr, "Failure: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    printf("%u\n", idx);
+
+    complete_action();
+}
+
+static void stream_state_callback(pa_stream *s, void *userdata) {
+    assert(s);
+
+    switch (pa_stream_get_state(s)) {
+        case PA_STREAM_CREATING:
+        case PA_STREAM_READY:
+            break;
+
+        case PA_STREAM_TERMINATED:
+            drain();
+            break;
+
+        case PA_STREAM_FAILED:
+        default:
+            fprintf(stderr, "Failed to upload sample: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
+            quit(1);
+    }
+}
+
+static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
+    sf_count_t l;
+    float *d;
+    assert(s && length && sndfile);
+
+    d = pa_xmalloc(length);
+
+    assert(sample_length >= length);
+    l = length/pa_frame_size(&sample_spec);
+
+    if ((sf_readf_float(sndfile, d, l)) != l) {
+        pa_xfree(d);
+        fprintf(stderr, "Premature end of file\n");
+        quit(1);
+    }
+
+    pa_stream_write(s, d, length, pa_xfree, 0, PA_SEEK_RELATIVE);
+
+    sample_length -= length;
+
+    if (sample_length  <= 0) {
+        pa_stream_set_write_callback(sample_stream, NULL, NULL);
+        pa_stream_finish_upload(sample_stream);
+    }
+}
+
+static void context_state_callback(pa_context *c, void *userdata) {
+    assert(c);
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+
+        case PA_CONTEXT_READY:
+            switch (action) {
+                case STAT:
+                    actions = 2;
+                    pa_operation_unref(pa_context_stat(c, stat_callback, NULL));
+                    pa_operation_unref(pa_context_get_server_info(c, get_server_info_callback, NULL));
+                    break;
+
+                case PLAY_SAMPLE:
+                    pa_operation_unref(pa_context_play_sample(c, sample_name, device, PA_VOLUME_NORM, simple_callback, NULL));
+                    break;
+
+                case REMOVE_SAMPLE:
+                    pa_operation_unref(pa_context_remove_sample(c, sample_name, simple_callback, NULL));
+                    break;
+
+                case UPLOAD_SAMPLE:
+                    sample_stream = pa_stream_new(c, sample_name, &sample_spec, NULL);
+                    assert(sample_stream);
+
+                    pa_stream_set_state_callback(sample_stream, stream_state_callback, NULL);
+                    pa_stream_set_write_callback(sample_stream, stream_write_callback, NULL);
+                    pa_stream_connect_upload(sample_stream, sample_length);
+                    break;
+
+                case EXIT:
+                    pa_operation_unref(pa_context_exit_daemon(c, NULL, NULL));
+                    drain();
+
+                case LIST:
+                    actions = 8;
+                    pa_operation_unref(pa_context_get_module_info_list(c, get_module_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_sink_info_list(c, get_sink_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_source_info_list(c, get_source_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_client_info_list(c, get_client_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_sample_info_list(c, get_sample_info_callback, NULL));
+                    pa_operation_unref(pa_context_get_autoload_info_list(c, get_autoload_info_callback, NULL));
+                    break;
+
+                case MOVE_SINK_INPUT:
+                    pa_operation_unref(pa_context_move_sink_input_by_name(c, sink_input_idx, sink_name, simple_callback, NULL));
+                    break;
+
+                case MOVE_SOURCE_OUTPUT:
+                    pa_operation_unref(pa_context_move_source_output_by_name(c, source_output_idx, source_name, simple_callback, NULL));
+                    break;
+
+                case LOAD_MODULE:
+                    pa_operation_unref(pa_context_load_module(c, module_name, module_args, index_callback, NULL));
+                    break;
+
+                case UNLOAD_MODULE:
+                    pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL));
+                    break;
+
+                case SUSPEND_SINK:
+                    if (sink_name)
+                        pa_operation_unref(pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL));
+                    else
+                        pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
+                    break;
+
+                case SUSPEND_SOURCE:
+                    if (source_name)
+                        pa_operation_unref(pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL));
+                    else
+                        pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
+                    break;
+
+                default:
+                    assert(0);
+            }
+            break;
+
+        case PA_CONTEXT_TERMINATED:
+            quit(0);
+            break;
+
+        case PA_CONTEXT_FAILED:
+        default:
+            fprintf(stderr, "Connection failure: %s\n", pa_strerror(pa_context_errno(c)));
+            quit(1);
+    }
+}
+
+static void exit_signal_callback(pa_mainloop_api *m, pa_signal_event *e, int sig, void *userdata) {
+    fprintf(stderr, "Got SIGINT, exiting.\n");
+    quit(0);
+}
+
+static void help(const char *argv0) {
+
+    printf("%s [options] stat\n"
+           "%s [options] list\n"
+           "%s [options] exit\n"
+           "%s [options] upload-sample FILENAME [NAME]\n"
+           "%s [options] play-sample NAME [SINK]\n"
+           "%s [options] remove-sample NAME\n"
+           "%s [options] move-sink-input ID SINK\n"
+           "%s [options] move-source-output ID SOURCE\n"
+           "%s [options] load-module NAME [ARGS ...]\n"
+           "%s [options] unload-module ID\n"
+           "%s [options] suspend-sink [SINK] 1|0\n"
+           "%s [options] suspend-source [SOURCE] 1|0\n\n"
+           "  -h, --help                            Show this help\n"
+           "      --version                         Show version\n\n"
+           "  -s, --server=SERVER                   The name of the server to connect to\n"
+           "  -n, --client-name=NAME                How to call this client on the server\n",
+           argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0);
+}
+
+enum { ARG_VERSION = 256 };
+
+int main(int argc, char *argv[]) {
+    pa_mainloop* m = NULL;
+    char tmp[PATH_MAX];
+    int ret = 1, r, c;
+    char *server = NULL, *client_name = NULL, *bn;
+
+    static const struct option long_options[] = {
+        {"server",      1, NULL, 's'},
+        {"client-name", 1, NULL, 'n'},
+        {"version",     0, NULL, ARG_VERSION},
+        {"help",        0, NULL, 'h'},
+        {NULL,          0, NULL, 0}
+    };
+
+    if (!(bn = strrchr(argv[0], '/')))
+        bn = argv[0];
+    else
+        bn++;
+
+    while ((c = getopt_long(argc, argv, "s:n:h", long_options, NULL)) != -1) {
+        switch (c) {
+            case 'h' :
+                help(bn);
+                ret = 0;
+                goto quit;
+
+            case ARG_VERSION:
+                printf("pactl "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
+                ret = 0;
+                goto quit;
+
+            case 's':
+                pa_xfree(server);
+                server = pa_xstrdup(optarg);
+                break;
+
+            case 'n':
+                pa_xfree(client_name);
+                client_name = pa_xstrdup(optarg);
+                break;
+
+            default:
+                goto quit;
+        }
+    }
+
+    if (!client_name)
+        client_name = pa_xstrdup(bn);
+
+    if (optind < argc) {
+        if (!strcmp(argv[optind], "stat"))
+            action = STAT;
+        else if (!strcmp(argv[optind], "exit"))
+            action = EXIT;
+        else if (!strcmp(argv[optind], "list"))
+            action = LIST;
+        else if (!strcmp(argv[optind], "upload-sample")) {
+            struct SF_INFO sfinfo;
+            action = UPLOAD_SAMPLE;
+
+            if (optind+1 >= argc) {
+                fprintf(stderr, "Please specify a sample file to load\n");
+                goto quit;
+            }
+
+            if (optind+2 < argc)
+                sample_name = pa_xstrdup(argv[optind+2]);
+            else {
+                char *f = strrchr(argv[optind+1], '/');
+                size_t n;
+                if (f)
+                    f++;
+                else
+                    f = argv[optind];
+
+                n = strcspn(f, ".");
+                strncpy(tmp, f, n);
+                tmp[n] = 0;
+                sample_name = pa_xstrdup(tmp);
+            }
+
+            memset(&sfinfo, 0, sizeof(sfinfo));
+            if (!(sndfile = sf_open(argv[optind+1], SFM_READ, &sfinfo))) {
+                fprintf(stderr, "Failed to open sound file.\n");
+                goto quit;
+            }
+
+            sample_spec.format =  PA_SAMPLE_FLOAT32;
+            sample_spec.rate = sfinfo.samplerate;
+            sample_spec.channels = sfinfo.channels;
+
+            sample_length = sfinfo.frames*pa_frame_size(&sample_spec);
+        } else if (!strcmp(argv[optind], "play-sample")) {
+            action = PLAY_SAMPLE;
+            if (argc != optind+2 && argc != optind+3) {
+                fprintf(stderr, "You have to specify a sample name to play\n");
+                goto quit;
+            }
+
+            sample_name = pa_xstrdup(argv[optind+1]);
+
+            if (optind+2 < argc)
+                device = pa_xstrdup(argv[optind+2]);
+
+        } else if (!strcmp(argv[optind], "remove-sample")) {
+            action = REMOVE_SAMPLE;
+            if (argc != optind+2) {
+                fprintf(stderr, "You have to specify a sample name to remove\n");
+                goto quit;
+            }
+
+            sample_name = pa_xstrdup(argv[optind+1]);
+        } else if (!strcmp(argv[optind], "move-sink-input")) {
+            action = MOVE_SINK_INPUT;
+            if (argc != optind+3) {
+                fprintf(stderr, "You have to specify a sink input index and a sink\n");
+                goto quit;
+            }
+
+            sink_input_idx = atoi(argv[optind+1]);
+            sink_name = pa_xstrdup(argv[optind+2]);
+        } else if (!strcmp(argv[optind], "move-source-output")) {
+            action = MOVE_SOURCE_OUTPUT;
+            if (argc != optind+3) {
+                fprintf(stderr, "You have to specify a source output index and a source\n");
+                goto quit;
+            }
+
+            source_output_idx = atoi(argv[optind+1]);
+            source_name = pa_xstrdup(argv[optind+2]);
+        } else if (!strcmp(argv[optind], "load-module")) {
+            int i;
+            size_t n = 0;
+            char *p;
+
+            action = LOAD_MODULE;
+
+            if (argc <= optind+1) {
+                fprintf(stderr, "You have to specify a module name and arguments.\n");
+                goto quit;
+            }
+
+            module_name = argv[optind+1];
+
+            for (i = optind+2; i < argc; i++)
+                n += strlen(argv[i])+1;
+
+            if (n > 0) {
+                p = module_args = pa_xnew0(char, n);
+
+                for (i = optind+2; i < argc; i++)
+                    p += sprintf(p, "%s%s", p == module_args ? "" : " ", argv[i]);
+            }
+
+        } else if (!strcmp(argv[optind], "unload-module")) {
+            action = UNLOAD_MODULE;
+
+            if (argc != optind+2) {
+                fprintf(stderr, "You have to specify a module index\n");
+                goto quit;
+            }
+
+            module_index = atoi(argv[optind+1]);
+
+        } else if (!strcmp(argv[optind], "suspend-sink")) {
+            action = SUSPEND_SINK;
+
+            if (argc > optind+3 || optind+1 >= argc) {
+                fprintf(stderr, "You may not specify more than one sink. You have to specify at least one boolean value.\n");
+                goto quit;
+            }
+
+            suspend = pa_parse_boolean(argv[argc-1]);
+
+            if (argc > optind+2)
+                sink_name = pa_xstrdup(argv[optind+1]);
+
+        } else if (!strcmp(argv[optind], "suspend-source")) {
+            action = SUSPEND_SOURCE;
+
+            if (argc > optind+3 || optind+1 >= argc) {
+                fprintf(stderr, "You may not specify more than one source. You have to specify at least one boolean value.\n");
+                goto quit;
+            }
+
+            suspend = pa_parse_boolean(argv[argc-1]);
+
+            if (argc > optind+2)
+                source_name = pa_xstrdup(argv[optind+1]);
+        }
+    }
+
+    if (action == NONE) {
+        fprintf(stderr, "No valid command specified.\n");
+        goto quit;
+    }
+
+    if (!(m = pa_mainloop_new())) {
+        fprintf(stderr, "pa_mainloop_new() failed.\n");
+        goto quit;
+    }
+
+    mainloop_api = pa_mainloop_get_api(m);
+
+    r = pa_signal_init(mainloop_api);
+    assert(r == 0);
+    pa_signal_new(SIGINT, exit_signal_callback, NULL);
+#ifdef SIGPIPE
+    signal(SIGPIPE, SIG_IGN);
+#endif
+
+    if (!(context = pa_context_new(mainloop_api, client_name))) {
+        fprintf(stderr, "pa_context_new() failed.\n");
+        goto quit;
+    }
+
+    pa_context_set_state_callback(context, context_state_callback, NULL);
+    pa_context_connect(context, server, 0, NULL);
+
+    if (pa_mainloop_run(m, &ret) < 0) {
+        fprintf(stderr, "pa_mainloop_run() failed.\n");
+        goto quit;
+    }
+
+quit:
+    if (sample_stream)
+        pa_stream_unref(sample_stream);
+
+    if (context)
+        pa_context_unref(context);
+
+    if (m) {
+        pa_signal_done();
+        pa_mainloop_free(m);
+    }
+
+    if (sndfile)
+        sf_close(sndfile);
+
+    pa_xfree(server);
+    pa_xfree(device);
+    pa_xfree(sample_name);
+    pa_xfree(sink_name);
+    pa_xfree(source_name);
+    pa_xfree(module_args);
+    pa_xfree(client_name);
+
+    return ret;
+}
diff --git a/src/utils/padsp b/src/utils/padsp
new file mode 100755
index 00000000..c70c3af7
--- /dev/null
+++ b/src/utils/padsp
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# $Id$
+#
+# This file is part of PulseAudio.
+#
+# Copyright 2006 Lennart Poettering
+# Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+#
+# 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 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
+# 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
+# USA.
+
+while getopts 'hs:n:m:MSDd' param ; do
+	case $param in
+		s)
+			PULSE_SERVER="$OPTARG"
+			export PULSE_SERVER
+			;;
+		n)
+			PADSP_CLIENT_NAME="$OPTARG"
+			export PADSP_CLIENT_NAME
+			;;
+		m)
+			PADSP_STREAM_NAME="$OPTARG"
+			export PADSP_STREAM_NAME
+			;;
+		M)
+			PADSP_NO_MIXER=1
+			export PADSP_NO_MIXER
+			;;
+		S)
+			PADSP_NO_SNDSTAT=1
+			export PADSP_NO_SNDSTAT
+			;;
+		D)
+			PADSP_NO_DSP=1
+			export PADSP_NO_DSP
+			;;
+		d)
+			if [ x"$PADSP_DEBUG" = x ]; then
+				PADSP_DEBUG=1
+			else
+				PADSP_DEBUG=$(( $PADSP_DEBUG + 1 ))
+			fi
+			export PADSP_DEBUG
+			;;
+		*)
+			echo "$0 - redirect OSS audio devices to PulseAudio"
+			echo " "
+			echo "$0 [options] application [arguments]"
+			echo " "
+			echo "options:"
+			echo "	-h                  show brief help"
+			echo "	-s <host>[:<port>]  contact a specific PulseAudio server"
+			echo "	-n <name>           client name to report to the server"
+			echo "	-m <name>           stream name to report to the server"
+			echo "	-M                  disable /dev/mixer emulation"
+			echo "	-S                  disable /dev/sndstat emulation"
+			echo "	-D                  disable /dev/dsp emulation"
+			echo "	-d                  enable debug output"
+			exit 0
+			;;
+	esac
+done
+
+shift $(( $OPTIND - 1 ))
+
+if [ x"$LD_PRELOAD" = x ] ; then
+   LD_PRELOAD="libpulsedsp.so"
+else
+   LD_PRELOAD="$LD_PRELOAD libpulsedsp.so"
+fi
+
+export LD_PRELOAD
+
+exec "$@"
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
new file mode 100644
index 00000000..cb57ff8a
--- /dev/null
+++ b/src/utils/padsp.c
@@ -0,0 +1,2664 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2006 Lennart Poettering
+  Copyright 2006-2007 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
+  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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef _FILE_OFFSET_BITS
+#undef _FILE_OFFSET_BITS
+#endif
+
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE 1
+#endif
+
+#include <sys/soundcard.h>
+#include <sys/ioctl.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <signal.h>
+
+#ifdef __linux__
+#include <linux/sockios.h>
+#endif
+
+#include <pulse/pulseaudio.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/gccmacro.h>
+
+/* On some systems SIOCINQ isn't defined, but FIONREAD is just an alias */
+#if !defined(SIOCINQ) && defined(FIONREAD)
+# define SIOCINQ FIONREAD
+#endif
+
+/* make sure gcc doesn't redefine open and friends as macros */
+#undef open
+#undef open64
+
+typedef enum {
+    FD_INFO_MIXER,
+    FD_INFO_STREAM,
+} fd_info_type_t;
+
+typedef struct fd_info fd_info;
+
+struct fd_info {
+    pthread_mutex_t mutex;
+    int ref;
+    int unusable;
+
+    fd_info_type_t type;
+    int app_fd, thread_fd;
+
+    pa_sample_spec sample_spec;
+    size_t fragment_size;
+    unsigned n_fragments;
+
+    pa_threaded_mainloop *mainloop;
+    pa_context *context;
+    pa_stream *play_stream;
+    pa_stream *rec_stream;
+    int play_precork;
+    int rec_precork;
+
+    pa_io_event *io_event;
+    pa_io_event_flags_t io_flags;
+
+    void *buf;
+    size_t rec_offset;
+
+    int operation_success;
+
+    pa_cvolume sink_volume, source_volume;
+    uint32_t sink_index, source_index;
+    int volume_modify_count;
+
+    int optr_n_blocks;
+
+    PA_LLIST_FIELDS(fd_info);
+};
+
+static int dsp_drain(fd_info *i);
+static void fd_info_remove_from_list(fd_info *i);
+
+static pthread_mutex_t fd_infos_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t func_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static PA_LLIST_HEAD(fd_info, fd_infos) = NULL;
+
+static int (*_ioctl)(int, int, void*) = NULL;
+static int (*_close)(int) = NULL;
+static int (*_open)(const char *, int, mode_t) = NULL;
+static FILE* (*_fopen)(const char *path, const char *mode) = NULL;
+static int (*_stat)(const char *, struct stat *) = NULL;
+#ifdef _STAT_VER
+static int (*___xstat)(int, const char *, struct stat *) = NULL;
+#endif
+#ifdef HAVE_OPEN64
+static int (*_open64)(const char *, int, mode_t) = NULL;
+static FILE* (*_fopen64)(const char *path, const char *mode) = NULL;
+static int (*_stat64)(const char *, struct stat64 *) = NULL;
+#ifdef _STAT_VER
+static int (*___xstat64)(int, const char *, struct stat64 *) = NULL;
+#endif
+#endif
+static int (*_fclose)(FILE *f) = NULL;
+static int (*_access)(const char *, int) = NULL;
+
+/* dlsym() violates ISO C, so confide the breakage into this function to
+ * avoid warnings. */
+typedef void (*fnptr)(void);
+static inline fnptr dlsym_fn(void *handle, const char *symbol) {
+    return (fnptr) (long) dlsym(handle, symbol);
+}
+
+#define LOAD_IOCTL_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_ioctl)  \
+        _ioctl = (int (*)(int, int, void*)) dlsym_fn(RTLD_NEXT, "ioctl"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_OPEN_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_open) \
+        _open = (int (*)(const char *, int, mode_t)) dlsym_fn(RTLD_NEXT, "open"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_OPEN64_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_open64) \
+        _open64 = (int (*)(const char *, int, mode_t)) dlsym_fn(RTLD_NEXT, "open64"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_CLOSE_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_close) \
+        _close = (int (*)(int)) dlsym_fn(RTLD_NEXT, "close"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_ACCESS_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_access) \
+        _access = (int (*)(const char*, int)) dlsym_fn(RTLD_NEXT, "access"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_STAT_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_stat) \
+        _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, "stat"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_STAT64_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_stat64) \
+        _stat64 = (int (*)(const char *, struct stat64 *)) dlsym_fn(RTLD_NEXT, "stat64"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_XSTAT_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!___xstat) \
+        ___xstat = (int (*)(int, const char *, struct stat *)) dlsym_fn(RTLD_NEXT, "__xstat"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_XSTAT64_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!___xstat64) \
+        ___xstat64 = (int (*)(int, const char *, struct stat64 *)) dlsym_fn(RTLD_NEXT, "__xstat64"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_FOPEN_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_fopen) \
+        _fopen = (FILE* (*)(const char *, const char*)) dlsym_fn(RTLD_NEXT, "fopen"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_FOPEN64_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_fopen64) \
+        _fopen64 = (FILE* (*)(const char *, const char*)) dlsym_fn(RTLD_NEXT, "fopen64"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define LOAD_FCLOSE_FUNC() \
+do { \
+    pthread_mutex_lock(&func_mutex); \
+    if (!_fclose) \
+        _fclose = (int (*)(FILE *)) dlsym_fn(RTLD_NEXT, "fclose"); \
+    pthread_mutex_unlock(&func_mutex); \
+} while(0)
+
+#define CONTEXT_CHECK_DEAD_GOTO(i, label) do { \
+if (!(i)->context || pa_context_get_state((i)->context) != PA_CONTEXT_READY) { \
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": Not connected: %s\n", (i)->context ? pa_strerror(pa_context_errno((i)->context)) : "NULL"); \
+    goto label; \
+} \
+} while(0)
+
+#define PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, label) do { \
+if (!(i)->context || pa_context_get_state((i)->context) != PA_CONTEXT_READY || \
+    !(i)->play_stream || pa_stream_get_state((i)->play_stream) != PA_STREAM_READY) { \
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": Not connected: %s\n", (i)->context ? pa_strerror(pa_context_errno((i)->context)) : "NULL"); \
+    goto label; \
+} \
+} while(0)
+
+#define RECORD_STREAM_CHECK_DEAD_GOTO(i, label) do { \
+if (!(i)->context || pa_context_get_state((i)->context) != PA_CONTEXT_READY || \
+    !(i)->rec_stream || pa_stream_get_state((i)->rec_stream) != PA_STREAM_READY) { \
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": Not connected: %s\n", (i)->context ? pa_strerror(pa_context_errno((i)->context)) : "NULL"); \
+    goto label; \
+} \
+} while(0)
+
+static void debug(int level, const char *format, ...) PA_GCC_PRINTF_ATTR(2,3);
+
+#define DEBUG_LEVEL_ALWAYS                0
+#define DEBUG_LEVEL_NORMAL                1
+#define DEBUG_LEVEL_VERBOSE                2
+
+static void debug(int level, const char *format, ...) {
+    va_list ap;
+    const char *dlevel_s;
+    int dlevel;
+
+    dlevel_s = getenv("PADSP_DEBUG");
+    if (!dlevel_s)
+        return;
+
+    dlevel = atoi(dlevel_s);
+
+    if (dlevel < level)
+        return;
+
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
+    va_end(ap);
+}
+
+static int padsp_disabled(void) {
+    static int *sym;
+    static int sym_resolved = 0;
+
+    /* If the current process has a symbol __padsp_disabled__ we use
+     * it to detect whether we should enable our stuff or not. A
+     * program needs to be compiled with -rdynamic for this to work!
+     * The symbol must be an int containing a three bit bitmask: bit 1
+     * -> disable /dev/dsp emulation, bit 2 -> disable /dev/sndstat
+     * emulation, bit 3 -> disable /dev/mixer emulation. Hence a value
+     * of 7 disables padsp entirely. */
+
+    pthread_mutex_lock(&func_mutex);
+    if (!sym_resolved) {
+        sym = (int*) dlsym(RTLD_DEFAULT, "__padsp_disabled__");
+        sym_resolved = 1;
+
+    }
+    pthread_mutex_unlock(&func_mutex);
+
+    if (!sym)
+        return 0;
+
+    return *sym;
+}
+
+static int dsp_cloak_enable(void) {
+    if (padsp_disabled() & 1)
+        return 0;
+
+    if (getenv("PADSP_NO_DSP"))
+        return 0;
+
+    return 1;
+}
+
+static int sndstat_cloak_enable(void) {
+    if (padsp_disabled() & 2)
+        return 0;
+
+    if (getenv("PADSP_NO_SNDSTAT"))
+        return 0;
+
+    return 1;
+}
+
+static int mixer_cloak_enable(void) {
+    if (padsp_disabled() & 4)
+        return 0;
+
+    if (getenv("PADSP_NO_MIXER"))
+        return 0;
+
+    return 1;
+}
+static pthread_key_t recursion_key;
+
+static void recursion_key_alloc(void) {
+    pthread_key_create(&recursion_key, NULL);
+}
+
+static int function_enter(void) {
+    /* Avoid recursive calls */
+    static pthread_once_t recursion_key_once = PTHREAD_ONCE_INIT;
+    pthread_once(&recursion_key_once, recursion_key_alloc);
+
+    if (pthread_getspecific(recursion_key))
+        return 0;
+
+    pthread_setspecific(recursion_key, (void*) 1);
+    return 1;
+}
+
+static void function_exit(void) {
+    pthread_setspecific(recursion_key, NULL);
+}
+
+static void fd_info_free(fd_info *i) {
+    assert(i);
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": freeing fd info (fd=%i)\n", i->app_fd);
+
+    dsp_drain(i);
+
+    if (i->mainloop)
+        pa_threaded_mainloop_stop(i->mainloop);
+
+    if (i->play_stream) {
+        pa_stream_disconnect(i->play_stream);
+        pa_stream_unref(i->play_stream);
+    }
+
+    if (i->rec_stream) {
+        pa_stream_disconnect(i->rec_stream);
+        pa_stream_unref(i->rec_stream);
+    }
+
+    if (i->context) {
+        pa_context_disconnect(i->context);
+        pa_context_unref(i->context);
+    }
+
+    if (i->mainloop)
+        pa_threaded_mainloop_free(i->mainloop);
+
+    if (i->app_fd >= 0) {
+        LOAD_CLOSE_FUNC();
+        _close(i->app_fd);
+    }
+
+    if (i->thread_fd >= 0) {
+        LOAD_CLOSE_FUNC();
+        _close(i->thread_fd);
+    }
+
+    free(i->buf);
+
+    pthread_mutex_destroy(&i->mutex);
+    free(i);
+}
+
+static fd_info *fd_info_ref(fd_info *i) {
+    assert(i);
+
+    pthread_mutex_lock(&i->mutex);
+    assert(i->ref >= 1);
+    i->ref++;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": ref++, now %i\n", i->ref);
+    pthread_mutex_unlock(&i->mutex);
+
+    return i;
+}
+
+static void fd_info_unref(fd_info *i) {
+    int r;
+    pthread_mutex_lock(&i->mutex);
+    assert(i->ref >= 1);
+    r = --i->ref;
+        debug(DEBUG_LEVEL_VERBOSE, __FILE__": ref--, now %i\n", i->ref);
+    pthread_mutex_unlock(&i->mutex);
+
+    if (r <= 0)
+        fd_info_free(i);
+}
+
+static void context_state_cb(pa_context *c, void *userdata) {
+    fd_info *i = userdata;
+    assert(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_READY:
+        case PA_CONTEXT_TERMINATED:
+        case PA_CONTEXT_FAILED:
+            pa_threaded_mainloop_signal(i->mainloop, 0);
+            break;
+
+        case PA_CONTEXT_UNCONNECTED:
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+    }
+}
+
+static void reset_params(fd_info *i) {
+    assert(i);
+
+    i->sample_spec.format = PA_SAMPLE_U8;
+    i->sample_spec.channels = 1;
+    i->sample_spec.rate = 8000;
+    i->fragment_size = 0;
+    i->n_fragments = 0;
+}
+
+static const char *client_name(char *buf, size_t n) {
+    char p[PATH_MAX];
+    const char *e;
+
+    if ((e = getenv("PADSP_CLIENT_NAME")))
+        return e;
+
+    if (pa_get_binary_name(p, sizeof(p)))
+        snprintf(buf, n, "OSS Emulation[%s]", p);
+    else
+        snprintf(buf, n, "OSS");
+
+    return buf;
+}
+
+static const char *stream_name(void) {
+    const char *e;
+
+    if ((e = getenv("PADSP_STREAM_NAME")))
+        return e;
+
+    return "Audio Stream";
+}
+
+static void atfork_prepare(void) {
+    fd_info *i;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_prepare() enter\n");
+
+    function_enter();
+
+    pthread_mutex_lock(&fd_infos_mutex);
+
+    for (i = fd_infos; i; i = i->next) {
+        pthread_mutex_lock(&i->mutex);
+        pa_threaded_mainloop_lock(i->mainloop);
+    }
+
+    pthread_mutex_lock(&func_mutex);
+
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_prepare() exit\n");
+}
+
+static void atfork_parent(void) {
+    fd_info *i;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_parent() enter\n");
+
+    pthread_mutex_unlock(&func_mutex);
+
+    for (i = fd_infos; i; i = i->next) {
+        pa_threaded_mainloop_unlock(i->mainloop);
+        pthread_mutex_unlock(&i->mutex);
+    }
+
+    pthread_mutex_unlock(&fd_infos_mutex);
+
+    function_exit();
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_parent() exit\n");
+}
+
+static void atfork_child(void) {
+    fd_info *i;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_child() enter\n");
+
+    /* We do only the bare minimum to get all fds closed */
+    pthread_mutex_init(&func_mutex, NULL);
+    pthread_mutex_init(&fd_infos_mutex, NULL);
+
+    for (i = fd_infos; i; i = i->next) {
+        pthread_mutex_init(&i->mutex, NULL);
+
+        if (i->context) {
+            pa_context_disconnect(i->context);
+            pa_context_unref(i->context);
+            i->context = NULL;
+        }
+
+        if (i->play_stream) {
+            pa_stream_unref(i->play_stream);
+            i->play_stream = NULL;
+        }
+
+        if (i->rec_stream) {
+            pa_stream_unref(i->rec_stream);
+            i->rec_stream = NULL;
+        }
+
+        if (i->app_fd >= 0) {
+            close(i->app_fd);
+            i->app_fd = -1;
+        }
+
+        if (i->thread_fd >= 0) {
+            close(i->thread_fd);
+            i->thread_fd = -1;
+        }
+
+        i->unusable = 1;
+    }
+
+    function_exit();
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_child() exit\n");
+}
+
+static void install_atfork(void) {
+    pthread_atfork(atfork_prepare, atfork_parent, atfork_child);
+}
+
+static void stream_success_cb(pa_stream *s, int success, void *userdata) {
+    fd_info *i = userdata;
+
+    assert(s);
+    assert(i);
+
+    i->operation_success = success;
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+}
+
+static void context_success_cb(pa_context *c, int success, void *userdata) {
+    fd_info *i = userdata;
+
+    assert(c);
+    assert(i);
+
+    i->operation_success = success;
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+}
+
+static fd_info* fd_info_new(fd_info_type_t type, int *_errno) {
+    fd_info *i;
+    int sfds[2] = { -1, -1 };
+    char name[64];
+    static pthread_once_t install_atfork_once = PTHREAD_ONCE_INIT;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": fd_info_new()\n");
+
+    signal(SIGPIPE, SIG_IGN); /* Yes, ugly as hell */
+
+    pthread_once(&install_atfork_once, install_atfork);
+
+    if (!(i = malloc(sizeof(fd_info)))) {
+        *_errno = ENOMEM;
+        goto fail;
+    }
+
+    i->app_fd = i->thread_fd = -1;
+    i->type = type;
+
+    i->mainloop = NULL;
+    i->context = NULL;
+    i->play_stream = NULL;
+    i->rec_stream = NULL;
+    i->play_precork = 0;
+    i->rec_precork = 0;
+    i->io_event = NULL;
+    i->io_flags = 0;
+    pthread_mutex_init(&i->mutex, NULL);
+    i->ref = 1;
+    i->buf = NULL;
+    i->rec_offset = 0;
+    i->unusable = 0;
+    pa_cvolume_reset(&i->sink_volume, 2);
+    pa_cvolume_reset(&i->source_volume, 2);
+    i->volume_modify_count = 0;
+    i->sink_index = (uint32_t) -1;
+    i->source_index = (uint32_t) -1;
+    i->optr_n_blocks = 0;
+    PA_LLIST_INIT(fd_info, i);
+
+    reset_params(i);
+
+    if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfds) < 0) {
+        *_errno = errno;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": socket() failed: %s\n", strerror(errno));
+        goto fail;
+    }
+
+    i->app_fd = sfds[0];
+    i->thread_fd = sfds[1];
+
+    if (!(i->mainloop = pa_threaded_mainloop_new())) {
+        *_errno = EIO;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_threaded_mainloop_new() failed\n");
+        goto fail;
+    }
+
+    if (!(i->context = pa_context_new(pa_threaded_mainloop_get_api(i->mainloop), client_name(name, sizeof(name))))) {
+        *_errno = EIO;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_context_new() failed\n");
+        goto fail;
+    }
+
+    pa_context_set_state_callback(i->context, context_state_cb, i);
+
+    if (pa_context_connect(i->context, NULL, 0, NULL) < 0) {
+        *_errno = ECONNREFUSED;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_context_connect() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    pa_threaded_mainloop_lock(i->mainloop);
+
+    if (pa_threaded_mainloop_start(i->mainloop) < 0) {
+        *_errno = EIO;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_threaded_mainloop_start() failed\n");
+        goto unlock_and_fail;
+    }
+
+    /* Wait until the context is ready */
+    pa_threaded_mainloop_wait(i->mainloop);
+
+    if (pa_context_get_state(i->context) != PA_CONTEXT_READY) {
+        *_errno = ECONNREFUSED;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_context_connect() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto unlock_and_fail;
+    }
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+    return i;
+
+unlock_and_fail:
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+fail:
+
+    if (i)
+        fd_info_unref(i);
+
+    return NULL;
+}
+
+static void fd_info_add_to_list(fd_info *i) {
+    assert(i);
+
+    pthread_mutex_lock(&fd_infos_mutex);
+    PA_LLIST_PREPEND(fd_info, fd_infos, i);
+    pthread_mutex_unlock(&fd_infos_mutex);
+
+    fd_info_ref(i);
+}
+
+static void fd_info_remove_from_list(fd_info *i) {
+    assert(i);
+
+    pthread_mutex_lock(&fd_infos_mutex);
+    PA_LLIST_REMOVE(fd_info, fd_infos, i);
+    pthread_mutex_unlock(&fd_infos_mutex);
+
+    fd_info_unref(i);
+}
+
+static fd_info* fd_info_find(int fd) {
+    fd_info *i;
+
+    pthread_mutex_lock(&fd_infos_mutex);
+
+    for (i = fd_infos; i; i = i->next)
+        if (i->app_fd == fd && !i->unusable) {
+            fd_info_ref(i);
+            break;
+        }
+
+    pthread_mutex_unlock(&fd_infos_mutex);
+
+    return i;
+}
+
+static void fix_metrics(fd_info *i) {
+    size_t fs;
+    char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
+
+    fs = pa_frame_size(&i->sample_spec);
+
+    /* Don't fix things more than necessary */
+    if ((i->fragment_size % fs) == 0 &&
+        i->n_fragments >= 2 &&
+        i->fragment_size > 0)
+        return;
+
+    i->fragment_size = (i->fragment_size/fs)*fs;
+
+    /* Number of fragments set? */
+    if (i->n_fragments < 2) {
+        if (i->fragment_size > 0) {
+            i->n_fragments = pa_bytes_per_second(&i->sample_spec) / 2 / i->fragment_size;
+            if (i->n_fragments < 2)
+                i->n_fragments = 2;
+        } else
+            i->n_fragments = 12;
+    }
+
+    /* Fragment size set? */
+    if (i->fragment_size <= 0) {
+        i->fragment_size = pa_bytes_per_second(&i->sample_spec) / 2 / i->n_fragments;
+        if (i->fragment_size < 1024)
+            i->fragment_size = 1024;
+    }
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": sample spec: %s\n", pa_sample_spec_snprint(t, sizeof(t), &i->sample_spec));
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": fixated metrics to %i fragments, %li bytes each.\n", i->n_fragments, (long)i->fragment_size);
+}
+
+static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
+    fd_info *i = userdata;
+    assert(s);
+
+    if (i->io_event) {
+        pa_mainloop_api *api;
+        size_t n;
+
+        api = pa_threaded_mainloop_get_api(i->mainloop);
+
+        if (s == i->play_stream) {
+            n = pa_stream_writable_size(i->play_stream);
+            if (n == (size_t)-1) {
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_writable_size(): %s\n",
+                    pa_strerror(pa_context_errno(i->context)));
+            }
+
+            if (n >= i->fragment_size)
+                i->io_flags |= PA_IO_EVENT_INPUT;
+            else
+                i->io_flags &= ~PA_IO_EVENT_INPUT;
+        }
+
+        if (s == i->rec_stream) {
+            n = pa_stream_readable_size(i->rec_stream);
+            if (n == (size_t)-1) {
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_readable_size(): %s\n",
+                    pa_strerror(pa_context_errno(i->context)));
+            }
+
+            if (n >= i->fragment_size)
+                i->io_flags |= PA_IO_EVENT_OUTPUT;
+            else
+                i->io_flags &= ~PA_IO_EVENT_OUTPUT;
+        }
+
+        api->io_enable(i->io_event, i->io_flags);
+    }
+}
+
+static void stream_latency_update_cb(pa_stream *s, void *userdata) {
+    fd_info *i = userdata;
+    assert(s);
+
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+}
+
+static void fd_info_shutdown(fd_info *i) {
+    assert(i);
+
+    if (i->io_event) {
+        pa_mainloop_api *api;
+        api = pa_threaded_mainloop_get_api(i->mainloop);
+        api->io_free(i->io_event);
+        i->io_event = NULL;
+        i->io_flags = 0;
+    }
+
+    if (i->thread_fd >= 0) {
+        close(i->thread_fd);
+        i->thread_fd = -1;
+    }
+}
+
+static int fd_info_copy_data(fd_info *i, int force) {
+    size_t n;
+
+    if (!i->play_stream && !i->rec_stream)
+        return -1;
+
+    if ((i->play_stream) && (pa_stream_get_state(i->play_stream) == PA_STREAM_READY)) {
+        n = pa_stream_writable_size(i->play_stream);
+
+        if (n == (size_t)-1) {
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_writable_size(): %s\n",
+                pa_strerror(pa_context_errno(i->context)));
+            return -1;
+        }
+
+        while (n >= i->fragment_size || force) {
+            ssize_t r;
+
+            if (!i->buf) {
+                if (!(i->buf = malloc(i->fragment_size))) {
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__": malloc() failed.\n");
+                    return -1;
+                }
+            }
+
+            if ((r = read(i->thread_fd, i->buf, i->fragment_size)) <= 0) {
+
+                if (errno == EAGAIN)
+                    break;
+
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": read(): %s\n", r == 0 ? "EOF" : strerror(errno));
+                return -1;
+            }
+
+            if (pa_stream_write(i->play_stream, i->buf, r, free, 0, PA_SEEK_RELATIVE) < 0) {
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_write(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                return -1;
+            }
+
+            i->buf = NULL;
+
+            assert(n >= (size_t) r);
+            n -= r;
+        }
+
+        if (n >= i->fragment_size)
+            i->io_flags |= PA_IO_EVENT_INPUT;
+        else
+            i->io_flags &= ~PA_IO_EVENT_INPUT;
+    }
+
+    if ((i->rec_stream) && (pa_stream_get_state(i->rec_stream) == PA_STREAM_READY)) {
+        n = pa_stream_readable_size(i->rec_stream);
+
+        if (n == (size_t)-1) {
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_readable_size(): %s\n",
+                pa_strerror(pa_context_errno(i->context)));
+            return -1;
+        }
+
+        while (n >= i->fragment_size || force) {
+            ssize_t r;
+            const void *data;
+            const char *buf;
+            size_t len;
+
+            if (pa_stream_peek(i->rec_stream, &data, &len) < 0) {
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_peek(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                return -1;
+            }
+
+            if (!data)
+                break;
+
+            buf = (const char*)data + i->rec_offset;
+
+            if ((r = write(i->thread_fd, buf, len - i->rec_offset)) <= 0) {
+
+                if (errno == EAGAIN)
+                    break;
+
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": write(): %s\n", strerror(errno));
+                return -1;
+            }
+
+            assert((size_t)r <= len - i->rec_offset);
+            i->rec_offset += r;
+
+            if (i->rec_offset == len) {
+                if (pa_stream_drop(i->rec_stream) < 0) {
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_drop(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                    return -1;
+                }
+                i->rec_offset = 0;
+            }
+
+            assert(n >= (size_t) r);
+            n -= r;
+        }
+
+        if (n >= i->fragment_size)
+            i->io_flags |= PA_IO_EVENT_OUTPUT;
+        else
+            i->io_flags &= ~PA_IO_EVENT_OUTPUT;
+    }
+
+    if (i->io_event) {
+        pa_mainloop_api *api;
+
+        api = pa_threaded_mainloop_get_api(i->mainloop);
+        api->io_enable(i->io_event, i->io_flags);
+    }
+
+    return 0;
+}
+
+static void stream_state_cb(pa_stream *s, void * userdata) {
+    fd_info *i = userdata;
+    assert(s);
+
+    switch (pa_stream_get_state(s)) {
+
+        case PA_STREAM_READY:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": stream established.\n");
+            break;
+
+        case PA_STREAM_FAILED:
+            if (s == i->play_stream) {
+                debug(DEBUG_LEVEL_NORMAL,
+                    __FILE__": pa_stream_connect_playback() failed: %s\n",
+                    pa_strerror(pa_context_errno(i->context)));
+                pa_stream_unref(i->play_stream);
+                i->play_stream = NULL;
+            } else if (s == i->rec_stream) {
+                debug(DEBUG_LEVEL_NORMAL,
+                    __FILE__": pa_stream_connect_record() failed: %s\n",
+                    pa_strerror(pa_context_errno(i->context)));
+                pa_stream_unref(i->rec_stream);
+                i->rec_stream = NULL;
+            }
+            fd_info_shutdown(i);
+            break;
+
+        case PA_STREAM_TERMINATED:
+        case PA_STREAM_UNCONNECTED:
+        case PA_STREAM_CREATING:
+            break;
+    }
+}
+
+static int create_playback_stream(fd_info *i) {
+    pa_buffer_attr attr;
+    int n, flags;
+
+    assert(i);
+
+    fix_metrics(i);
+
+    if (!(i->play_stream = pa_stream_new(i->context, stream_name(), &i->sample_spec, NULL))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_new() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    pa_stream_set_state_callback(i->play_stream, stream_state_cb, i);
+    pa_stream_set_write_callback(i->play_stream, stream_request_cb, i);
+    pa_stream_set_latency_update_callback(i->play_stream, stream_latency_update_cb, i);
+
+    memset(&attr, 0, sizeof(attr));
+    attr.maxlength = i->fragment_size * (i->n_fragments+1);
+    attr.tlength = i->fragment_size * i->n_fragments;
+    attr.prebuf = i->fragment_size;
+    attr.minreq = i->fragment_size;
+
+    flags = PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE;
+    if (i->play_precork) {
+        flags |= PA_STREAM_START_CORKED;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": creating stream corked\n");
+    }
+    if (pa_stream_connect_playback(i->play_stream, NULL, &attr, flags, NULL, NULL) < 0) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_connect_playback() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    n = i->fragment_size;
+    setsockopt(i->app_fd, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n));
+    n = i->fragment_size;
+    setsockopt(i->thread_fd, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n));
+
+    return 0;
+
+fail:
+    return -1;
+}
+
+static int create_record_stream(fd_info *i) {
+    pa_buffer_attr attr;
+    int n, flags;
+
+    assert(i);
+
+    fix_metrics(i);
+
+    if (!(i->rec_stream = pa_stream_new(i->context, stream_name(), &i->sample_spec, NULL))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_new() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    pa_stream_set_state_callback(i->rec_stream, stream_state_cb, i);
+    pa_stream_set_read_callback(i->rec_stream, stream_request_cb, i);
+    pa_stream_set_latency_update_callback(i->rec_stream, stream_latency_update_cb, i);
+
+    memset(&attr, 0, sizeof(attr));
+    attr.maxlength = i->fragment_size * (i->n_fragments+1);
+    attr.fragsize = i->fragment_size;
+
+    flags = PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE;
+    if (i->rec_precork) {
+        flags |= PA_STREAM_START_CORKED;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": creating stream corked\n");
+    }
+    if (pa_stream_connect_record(i->rec_stream, NULL, &attr, flags) < 0) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_connect_record() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    n = i->fragment_size;
+    setsockopt(i->app_fd, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n));
+    n = i->fragment_size;
+    setsockopt(i->thread_fd, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n));
+
+    return 0;
+
+fail:
+    return -1;
+}
+
+static void free_streams(fd_info *i) {
+    assert(i);
+
+    if (i->play_stream) {
+        pa_stream_disconnect(i->play_stream);
+        pa_stream_unref(i->play_stream);
+        i->play_stream = NULL;
+        i->io_flags |= PA_IO_EVENT_INPUT;
+    }
+
+    if (i->rec_stream) {
+        pa_stream_disconnect(i->rec_stream);
+        pa_stream_unref(i->rec_stream);
+        i->rec_stream = NULL;
+        i->io_flags |= PA_IO_EVENT_OUTPUT;
+    }
+
+    if (i->io_event) {
+        pa_mainloop_api *api;
+
+        api = pa_threaded_mainloop_get_api(i->mainloop);
+        api->io_enable(i->io_event, i->io_flags);
+    }
+}
+
+static void io_event_cb(pa_mainloop_api *api, pa_io_event *e, int fd, pa_io_event_flags_t flags, void *userdata) {
+    fd_info *i = userdata;
+
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+
+    if (flags & PA_IO_EVENT_INPUT) {
+
+        if (!i->play_stream) {
+            if (create_playback_stream(i) < 0)
+                goto fail;
+        } else {
+            if (fd_info_copy_data(i, 0) < 0)
+                goto fail;
+        }
+
+    } else if (flags & PA_IO_EVENT_OUTPUT) {
+
+        if (!i->rec_stream) {
+            if (create_record_stream(i) < 0)
+                goto fail;
+        } else {
+            if (fd_info_copy_data(i, 0) < 0)
+                goto fail;
+        }
+
+    } else if (flags & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR))
+        goto fail;
+
+    return;
+
+fail:
+    /* We can't do anything better than removing the event source */
+    fd_info_shutdown(i);
+}
+
+static int dsp_open(int flags, int *_errno) {
+    fd_info *i;
+    pa_mainloop_api *api;
+    int ret;
+    int f;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open()\n");
+
+    if (!(i = fd_info_new(FD_INFO_STREAM, _errno)))
+        return -1;
+
+    if ((flags & O_NONBLOCK) == O_NONBLOCK) {
+        if ((f = fcntl(i->app_fd, F_GETFL)) >= 0)
+            fcntl(i->app_fd, F_SETFL, f|O_NONBLOCK);
+    }
+    if ((f = fcntl(i->thread_fd, F_GETFL)) >= 0)
+        fcntl(i->thread_fd, F_SETFL, f|O_NONBLOCK);
+
+    fcntl(i->app_fd, F_SETFD, FD_CLOEXEC);
+    fcntl(i->thread_fd, F_SETFD, FD_CLOEXEC);
+
+    pa_threaded_mainloop_lock(i->mainloop);
+    api = pa_threaded_mainloop_get_api(i->mainloop);
+
+    switch (flags & O_ACCMODE) {
+    case O_RDONLY:
+        i->io_flags = PA_IO_EVENT_OUTPUT;
+        shutdown(i->thread_fd, SHUT_RD);
+        shutdown(i->app_fd, SHUT_WR);
+        break;
+    case O_WRONLY:
+        i->io_flags = PA_IO_EVENT_INPUT;
+        shutdown(i->thread_fd, SHUT_WR);
+        shutdown(i->app_fd, SHUT_RD);
+        break;
+    case O_RDWR:
+        i->io_flags = PA_IO_EVENT_INPUT | PA_IO_EVENT_OUTPUT;
+        break;
+    default:
+        return -1;
+    }
+
+    if (!(i->io_event = api->io_new(api, i->thread_fd, i->io_flags, io_event_cb, i)))
+        goto fail;
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open() succeeded, fd=%i\n", i->app_fd);
+
+    fd_info_add_to_list(i);
+    ret = i->app_fd;
+    fd_info_unref(i);
+
+    return ret;
+
+fail:
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    if (i)
+        fd_info_unref(i);
+
+    *_errno = EIO;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open() failed\n");
+
+    return -1;
+}
+
+static void sink_info_cb(pa_context *context, const pa_sink_info *si, int eol, void *userdata) {
+    fd_info *i = userdata;
+
+    if (!si && eol < 0) {
+        i->operation_success = 0;
+        pa_threaded_mainloop_signal(i->mainloop, 0);
+        return;
+    }
+
+    if (eol)
+        return;
+
+    if (!pa_cvolume_equal(&i->sink_volume, &si->volume))
+        i->volume_modify_count++;
+
+    i->sink_volume = si->volume;
+    i->sink_index = si->index;
+
+    i->operation_success = 1;
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+}
+
+static void source_info_cb(pa_context *context, const pa_source_info *si, int eol, void *userdata) {
+    fd_info *i = userdata;
+
+    if (!si && eol < 0) {
+        i->operation_success = 0;
+        pa_threaded_mainloop_signal(i->mainloop, 0);
+        return;
+    }
+
+    if (eol)
+        return;
+
+    if (!pa_cvolume_equal(&i->source_volume, &si->volume))
+        i->volume_modify_count++;
+
+    i->source_volume = si->volume;
+    i->source_index = si->index;
+
+    i->operation_success = 1;
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+}
+
+static void subscribe_cb(pa_context *context, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
+    fd_info *i = userdata;
+    pa_operation *o = NULL;
+
+    if (i->sink_index != idx)
+        return;
+
+    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
+        return;
+
+    if (!(o = pa_context_get_sink_info_by_index(i->context, i->sink_index, sink_info_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to get sink info: %s", pa_strerror(pa_context_errno(i->context)));
+        return;
+    }
+
+    pa_operation_unref(o);
+}
+
+static int mixer_open(int flags, int *_errno) {
+    fd_info *i;
+    pa_operation *o = NULL;
+    int ret;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": mixer_open()\n");
+
+    if (!(i = fd_info_new(FD_INFO_MIXER, _errno)))
+        return -1;
+
+    pa_threaded_mainloop_lock(i->mainloop);
+
+    pa_context_set_subscribe_callback(i->context, subscribe_cb, i);
+
+    if (!(o = pa_context_subscribe(i->context, PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE, context_success_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to subscribe to events: %s", pa_strerror(pa_context_errno(i->context)));
+        *_errno = EIO;
+        goto fail;
+    }
+
+    i->operation_success = 0;
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        pa_threaded_mainloop_wait(i->mainloop);
+        CONTEXT_CHECK_DEAD_GOTO(i, fail);
+    }
+
+    pa_operation_unref(o);
+    o = NULL;
+
+    if (!i->operation_success) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__":Failed to subscribe to events: %s", pa_strerror(pa_context_errno(i->context)));
+        *_errno = EIO;
+        goto fail;
+    }
+
+    /* Get sink info */
+
+    if (!(o = pa_context_get_sink_info_by_name(i->context, NULL, sink_info_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to get sink info: %s", pa_strerror(pa_context_errno(i->context)));
+        *_errno = EIO;
+        goto fail;
+    }
+
+    i->operation_success = 0;
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        pa_threaded_mainloop_wait(i->mainloop);
+        CONTEXT_CHECK_DEAD_GOTO(i, fail);
+    }
+
+    pa_operation_unref(o);
+    o = NULL;
+
+    if (!i->operation_success) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to get sink info: %s", pa_strerror(pa_context_errno(i->context)));
+        *_errno = EIO;
+        goto fail;
+    }
+
+    /* Get source info */
+
+    if (!(o = pa_context_get_source_info_by_name(i->context, NULL, source_info_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to get source info: %s", pa_strerror(pa_context_errno(i->context)));
+        *_errno = EIO;
+        goto fail;
+    }
+
+    i->operation_success = 0;
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        pa_threaded_mainloop_wait(i->mainloop);
+        CONTEXT_CHECK_DEAD_GOTO(i, fail);
+    }
+
+    pa_operation_unref(o);
+    o = NULL;
+
+    if (!i->operation_success) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to get source info: %s", pa_strerror(pa_context_errno(i->context)));
+        *_errno = EIO;
+        goto fail;
+    }
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": mixer_open() succeeded, fd=%i\n", i->app_fd);
+
+    fd_info_add_to_list(i);
+    ret = i->app_fd;
+    fd_info_unref(i);
+
+    return ret;
+
+fail:
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    if (i)
+        fd_info_unref(i);
+
+    *_errno = EIO;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": mixer_open() failed\n");
+
+    return -1;
+}
+
+static int sndstat_open(int flags, int *_errno) {
+    static const char sndstat[] =
+        "Sound Driver:3.8.1a-980706 (PulseAudio Virtual OSS)\n"
+        "Kernel: POSIX\n"
+        "Config options: 0\n"
+        "\n"
+        "Installed drivers:\n"
+        "Type 255: PulseAudio Virtual OSS\n"
+        "\n"
+        "Card config:\n"
+        "PulseAudio Virtual OSS\n"
+        "\n"
+        "Audio devices:\n"
+        "0: PulseAudio Virtual OSS\n"
+        "\n"
+        "Synth devices: NOT ENABLED IN CONFIG\n"
+        "\n"
+        "Midi devices:\n"
+        "\n"
+        "Timers:\n"
+        "\n"
+        "Mixers:\n"
+        "0: PulseAudio Virtual OSS\n";
+
+    char fn[] = "/tmp/padsp-sndstat-XXXXXX";
+    mode_t u;
+    int fd = -1;
+    int e;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": sndstat_open()\n");
+
+    if (flags != O_RDONLY
+#ifdef O_LARGEFILE
+        && flags != (O_RDONLY|O_LARGEFILE)
+#endif
+       ) {
+        *_errno = EACCES;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": bad access!\n");
+        goto fail;
+    }
+
+    u = umask(0077);
+    fd = mkstemp(fn);
+    e = errno;
+    umask(u);
+
+    if (fd < 0) {
+        *_errno = e;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": mkstemp() failed: %s\n", strerror(errno));
+        goto fail;
+    }
+
+    unlink(fn);
+
+    if (write(fd, sndstat, sizeof(sndstat) -1) != sizeof(sndstat)-1) {
+        *_errno = errno;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": write() failed: %s\n", strerror(errno));
+        goto fail;
+    }
+
+    if (lseek(fd, SEEK_SET, 0) < 0) {
+        *_errno = errno;
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": lseek() failed: %s\n", strerror(errno));
+        goto fail;
+    }
+
+    return fd;
+
+fail:
+    if (fd >= 0)
+        close(fd);
+    return -1;
+}
+
+static int real_open(const char *filename, int flags, mode_t mode) {
+    int r, _errno = 0;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": open(%s)\n", filename?filename:"NULL");
+
+    if (!function_enter()) {
+        LOAD_OPEN_FUNC();
+        return _open(filename, flags, mode);
+    }
+
+    if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0))
+        r = dsp_open(flags, &_errno);
+    else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0)
+        r = mixer_open(flags, &_errno);
+    else if (filename && sndstat_cloak_enable() && strcmp(filename, "/dev/sndstat") == 0)
+        r = sndstat_open(flags, &_errno);
+    else {
+        function_exit();
+        LOAD_OPEN_FUNC();
+        return _open(filename, flags, mode);
+    }
+
+    function_exit();
+
+    if (_errno)
+        errno = _errno;
+
+    return r;
+}
+
+int open(const char *filename, int flags, ...) {
+    va_list args;
+    mode_t mode = 0;
+
+    if (flags & O_CREAT) {
+        va_start(args, flags);
+        if (sizeof(mode_t) < sizeof(int))
+            mode = va_arg(args, int);
+        else
+            mode = va_arg(args, mode_t);
+        va_end(args);
+    }
+
+    return real_open(filename, flags, mode);
+}
+
+static int mixer_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno) {
+    int ret = -1;
+
+    switch (request) {
+        case SOUND_MIXER_READ_DEVMASK :
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_DEVMASK\n");
+
+            *(int*) argp = SOUND_MASK_PCM | SOUND_MASK_IGAIN;
+            break;
+
+        case SOUND_MIXER_READ_RECMASK :
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_RECMASK\n");
+
+            *(int*) argp = SOUND_MASK_IGAIN;
+            break;
+
+        case SOUND_MIXER_READ_STEREODEVS:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_STEREODEVS\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+            *(int*) argp = 0;
+            if (i->sink_volume.channels > 1)
+                *(int*) argp |= SOUND_MASK_PCM;
+            if (i->source_volume.channels > 1)
+                *(int*) argp |= SOUND_MASK_IGAIN;
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            break;
+
+        case SOUND_MIXER_READ_RECSRC:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_RECSRC\n");
+
+            *(int*) argp = SOUND_MASK_IGAIN;
+            break;
+
+        case SOUND_MIXER_WRITE_RECSRC:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_WRITE_RECSRC\n");
+            break;
+
+        case SOUND_MIXER_READ_CAPS:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_CAPS\n");
+
+            *(int*) argp = 0;
+            break;
+
+        case SOUND_MIXER_READ_PCM:
+        case SOUND_MIXER_READ_IGAIN: {
+            pa_cvolume *v;
+
+            if (request == SOUND_MIXER_READ_PCM)
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_PCM\n");
+            else
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_IGAIN\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            if (request == SOUND_MIXER_READ_PCM)
+                v = &i->sink_volume;
+            else
+                v = &i->source_volume;
+
+            *(int*) argp =
+                ((v->values[0]*100/PA_VOLUME_NORM)) |
+                ((v->values[v->channels > 1 ? 1 : 0]*100/PA_VOLUME_NORM)  << 8);
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            break;
+        }
+
+        case SOUND_MIXER_WRITE_PCM:
+        case SOUND_MIXER_WRITE_IGAIN: {
+            pa_cvolume v, *pv;
+
+            if (request == SOUND_MIXER_WRITE_PCM)
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_WRITE_PCM\n");
+            else
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_WRITE_IGAIN\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            if (request == SOUND_MIXER_WRITE_PCM) {
+                v = i->sink_volume;
+                pv = &i->sink_volume;
+            } else {
+                v = i->source_volume;
+                pv = &i->source_volume;
+            }
+
+            pv->values[0] = ((*(int*) argp & 0xFF)*PA_VOLUME_NORM)/100;
+            pv->values[1] = ((*(int*) argp >> 8)*PA_VOLUME_NORM)/100;
+
+            if (!pa_cvolume_equal(pv, &v)) {
+                pa_operation *o;
+
+                if (request == SOUND_MIXER_WRITE_PCM)
+                    o = pa_context_set_sink_volume_by_index(i->context, i->sink_index, pv, context_success_cb, i);
+                else
+                    o = pa_context_set_source_volume_by_index(i->context, i->source_index, pv, context_success_cb, i);
+
+                if (!o)
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__":Failed set volume: %s", pa_strerror(pa_context_errno(i->context)));
+                else {
+
+                    i->operation_success = 0;
+                    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+                        CONTEXT_CHECK_DEAD_GOTO(i, exit_loop);
+
+                        pa_threaded_mainloop_wait(i->mainloop);
+                    }
+                exit_loop:
+
+                    if (!i->operation_success)
+                        debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to set volume: %s\n", pa_strerror(pa_context_errno(i->context)));
+
+                    pa_operation_unref(o);
+                }
+
+                /* We don't wait for completion here */
+                i->volume_modify_count++;
+            }
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            break;
+        }
+
+        case SOUND_MIXER_INFO: {
+            mixer_info *mi = argp;
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_INFO\n");
+
+            memset(mi, 0, sizeof(mixer_info));
+            strncpy(mi->id, "PULSEAUDIO", sizeof(mi->id));
+            strncpy(mi->name, "PulseAudio Virtual OSS", sizeof(mi->name));
+            pa_threaded_mainloop_lock(i->mainloop);
+            mi->modify_counter = i->volume_modify_count;
+            pa_threaded_mainloop_unlock(i->mainloop);
+            break;
+        }
+
+        default:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": unknown ioctl 0x%08lx\n", request);
+
+            *_errno = EINVAL;
+            goto fail;
+    }
+
+    ret = 0;
+
+fail:
+
+    return ret;
+}
+
+static int map_format(int *fmt, pa_sample_spec *ss) {
+
+    switch (*fmt) {
+        case AFMT_MU_LAW:
+            ss->format = PA_SAMPLE_ULAW;
+            break;
+
+        case AFMT_A_LAW:
+            ss->format = PA_SAMPLE_ALAW;
+            break;
+
+        case AFMT_S8:
+            *fmt = AFMT_U8;
+            /* fall through */
+        case AFMT_U8:
+            ss->format = PA_SAMPLE_U8;
+            break;
+
+        case AFMT_U16_BE:
+            *fmt = AFMT_S16_BE;
+            /* fall through */
+        case AFMT_S16_BE:
+            ss->format = PA_SAMPLE_S16BE;
+            break;
+
+        case AFMT_U16_LE:
+            *fmt = AFMT_S16_LE;
+            /* fall through */
+        case AFMT_S16_LE:
+            ss->format = PA_SAMPLE_S16LE;
+            break;
+
+        default:
+            ss->format = PA_SAMPLE_S16NE;
+            *fmt = AFMT_S16_NE;
+            break;
+    }
+
+    return 0;
+}
+
+static int map_format_back(pa_sample_format_t format) {
+    switch (format) {
+        case PA_SAMPLE_S16LE: return AFMT_S16_LE;
+        case PA_SAMPLE_S16BE: return AFMT_S16_BE;
+        case PA_SAMPLE_ULAW: return AFMT_MU_LAW;
+        case PA_SAMPLE_ALAW: return AFMT_A_LAW;
+        case PA_SAMPLE_U8: return AFMT_U8;
+        default:
+            abort();
+    }
+}
+
+static int dsp_flush_fd(int fd) {
+#ifdef SIOCINQ
+    int l;
+
+    if (ioctl(fd, SIOCINQ, &l) < 0) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ: %s\n", strerror(errno));
+        return -1;
+    }
+
+    while (l > 0) {
+        char buf[1024];
+        size_t k;
+
+        k = (size_t) l > sizeof(buf) ? sizeof(buf) : (size_t) l;
+        if (read(fd, buf, k) < 0)
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": read(): %s\n", strerror(errno));
+        l -= k;
+    }
+
+    return 0;
+#else
+# warning "Your platform does not support SIOCINQ, something might not work as intended."
+    return 0;
+#endif
+}
+
+static int dsp_flush_socket(fd_info *i) {
+    int res = 0;
+
+    if ((i->thread_fd < 0) && (i->app_fd < 0))
+        return -1;
+
+    if (i->thread_fd >= 0)
+        res = dsp_flush_fd(i->thread_fd);
+
+    if (res < 0)
+        return res;
+
+    if (i->app_fd >= 0)
+        res = dsp_flush_fd(i->app_fd);
+
+    if (res < 0)
+        return res;
+
+    return 0;
+}
+
+static int dsp_empty_socket(fd_info *i) {
+#ifdef SIOCINQ
+    int ret = -1;
+
+    /* Empty the socket */
+    for (;;) {
+        int l;
+
+        if (i->thread_fd < 0)
+            break;
+
+        if (ioctl(i->thread_fd, SIOCINQ, &l) < 0) {
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ: %s\n", strerror(errno));
+            break;
+        }
+
+        if (!l) {
+            ret = 0;
+            break;
+        }
+
+        pa_threaded_mainloop_wait(i->mainloop);
+    }
+
+    return ret;
+#else
+# warning "Your platform does not support SIOCINQ, something might not work as intended."
+    return 0;
+#endif
+}
+
+static int dsp_drain(fd_info *i) {
+    pa_operation *o = NULL;
+    int r = -1;
+
+    if (!i->mainloop)
+        return 0;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": Draining.\n");
+
+    pa_threaded_mainloop_lock(i->mainloop);
+
+    if (dsp_empty_socket(i) < 0)
+        goto fail;
+
+    if (!i->play_stream)
+        goto fail;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": Really draining.\n");
+
+    if (!(o = pa_stream_drain(i->play_stream, stream_success_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_drain(): %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    i->operation_success = 0;
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, fail);
+
+        pa_threaded_mainloop_wait(i->mainloop);
+    }
+
+    if (!i->operation_success) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_drain() 2: %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    r = 0;
+
+fail:
+
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    return 0;
+}
+
+static int dsp_trigger(fd_info *i) {
+    pa_operation *o = NULL;
+    int r = -1;
+
+    if (!i->play_stream)
+        return 0;
+
+    pa_threaded_mainloop_lock(i->mainloop);
+
+    if (dsp_empty_socket(i) < 0)
+        goto fail;
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": Triggering.\n");
+
+    if (!(o = pa_stream_trigger(i->play_stream, stream_success_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_trigger(): %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    i->operation_success = 0;
+    while (!pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, fail);
+
+        pa_threaded_mainloop_wait(i->mainloop);
+    }
+
+    if (!i->operation_success) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_trigger(): %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    r = 0;
+
+fail:
+
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    return 0;
+}
+
+static int dsp_cork(fd_info *i, pa_stream *s, int b) {
+    pa_operation *o = NULL;
+    int r = -1;
+
+    pa_threaded_mainloop_lock(i->mainloop);
+
+    if (!(o = pa_stream_cork(s, b, stream_success_cb, i))) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_cork(): %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    i->operation_success = 0;
+    while (!pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        if (s == i->play_stream)
+            PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, fail);
+        else if (s == i->rec_stream)
+            RECORD_STREAM_CHECK_DEAD_GOTO(i, fail);
+
+        pa_threaded_mainloop_wait(i->mainloop);
+    }
+
+    if (!i->operation_success) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_cork(): %s\n", pa_strerror(pa_context_errno(i->context)));
+        goto fail;
+    }
+
+    r = 0;
+
+fail:
+
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(i->mainloop);
+
+    return 0;
+}
+
+static int dsp_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno) {
+    int ret = -1;
+
+    if (i->thread_fd == -1) {
+        /*
+         * We've encountered some fatal error and are just waiting
+         * for a close.
+         */
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": got ioctl 0x%08lx in fatal error state\n", request);
+        *_errno = EIO;
+        return -1;
+    }
+
+    switch (request) {
+        case SNDCTL_DSP_SETFMT: {
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SETFMT: %i\n", *(int*) argp);
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            if (*(int*) argp == AFMT_QUERY)
+                *(int*) argp = map_format_back(i->sample_spec.format);
+            else {
+                map_format((int*) argp, &i->sample_spec);
+                free_streams(i);
+            }
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+            break;
+        }
+
+        case SNDCTL_DSP_SPEED: {
+            pa_sample_spec ss;
+            int valid;
+            char t[256];
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SPEED: %i\n", *(int*) argp);
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            ss = i->sample_spec;
+            ss.rate = *(int*) argp;
+
+            if ((valid = pa_sample_spec_valid(&ss))) {
+                i->sample_spec = ss;
+                free_streams(i);
+            }
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": ss: %s\n", pa_sample_spec_snprint(t, sizeof(t), &i->sample_spec));
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            if (!valid) {
+                *_errno = EINVAL;
+                goto fail;
+            }
+
+            break;
+        }
+
+        case SNDCTL_DSP_STEREO:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_STEREO: %i\n", *(int*) argp);
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            i->sample_spec.channels = *(int*) argp ? 2 : 1;
+            free_streams(i);
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+            return 0;
+
+        case SNDCTL_DSP_CHANNELS: {
+            pa_sample_spec ss;
+            int valid;
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_CHANNELS: %i\n", *(int*) argp);
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            ss = i->sample_spec;
+            ss.channels = *(int*) argp;
+
+            if ((valid = pa_sample_spec_valid(&ss))) {
+                i->sample_spec = ss;
+                free_streams(i);
+            }
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            if (!valid) {
+                *_errno = EINVAL;
+                goto fail;
+            }
+
+            break;
+        }
+
+        case SNDCTL_DSP_GETBLKSIZE:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETBLKSIZE\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            fix_metrics(i);
+            *(int*) argp = i->fragment_size;
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            break;
+
+        case SNDCTL_DSP_SETFRAGMENT:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SETFRAGMENT: 0x%08x\n", *(int*) argp);
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            i->fragment_size = 1 << ((*(int*) argp) & 31);
+            i->n_fragments = (*(int*) argp) >> 16;
+
+            /* 0x7FFF means that we can set whatever we like */
+            if (i->n_fragments == 0x7FFF)
+                i->n_fragments = 12;
+
+            free_streams(i);
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            break;
+
+        case SNDCTL_DSP_GETCAPS:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_CAPS\n");
+
+            *(int*)  argp = DSP_CAP_DUPLEX | DSP_CAP_TRIGGER
+#ifdef DSP_CAP_MULTI
+              | DSP_CAP_MULTI
+#endif
+              ;
+            break;
+
+        case SNDCTL_DSP_GETODELAY: {
+            int l;
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETODELAY\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            *(int*) argp = 0;
+
+            for (;;) {
+                pa_usec_t usec;
+
+                PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, exit_loop);
+
+                if (pa_stream_get_latency(i->play_stream, &usec, NULL) >= 0) {
+                    *(int*) argp = pa_usec_to_bytes(usec, &i->sample_spec);
+                    break;
+                }
+
+                if (pa_context_errno(i->context) != PA_ERR_NODATA) {
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_get_latency(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                    break;
+                }
+
+                pa_threaded_mainloop_wait(i->mainloop);
+            }
+
+        exit_loop:
+
+#ifdef SIOCINQ
+            if (ioctl(i->thread_fd, SIOCINQ, &l) < 0)
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ failed: %s\n", strerror(errno));
+            else
+                *(int*) argp += l;
+#else
+# warning "Your platform does not support SIOCINQ, something might not work as intended."
+#endif
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": ODELAY: %i\n", *(int*) argp);
+
+            break;
+        }
+
+        case SNDCTL_DSP_RESET: {
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_RESET\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            free_streams(i);
+            dsp_flush_socket(i);
+
+            i->optr_n_blocks = 0;
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+            break;
+        }
+
+        case SNDCTL_DSP_GETFMTS: {
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETFMTS\n");
+
+            *(int*) argp = AFMT_MU_LAW|AFMT_A_LAW|AFMT_U8|AFMT_S16_LE|AFMT_S16_BE;
+            break;
+        }
+
+        case SNDCTL_DSP_POST:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_POST\n");
+
+            if (dsp_trigger(i) < 0)
+                *_errno = EIO;
+            break;
+
+        case SNDCTL_DSP_GETTRIGGER:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETTRIGGER\n");
+
+            *(int*) argp = 0;
+            if (!i->play_precork)
+                *(int*) argp |= PCM_ENABLE_OUTPUT;
+            if (!i->rec_precork)
+                *(int*) argp |= PCM_ENABLE_INPUT;
+
+            break;
+
+        case SNDCTL_DSP_SETTRIGGER:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SETTRIGGER: 0x%08x\n", *(int*) argp);
+
+            if (!i->io_event) {
+                *_errno = EIO;
+                break;
+            }
+
+            i->play_precork = !((*(int*) argp) & PCM_ENABLE_OUTPUT);
+
+            if (i->play_stream) {
+                if (dsp_cork(i, i->play_stream, !((*(int*) argp) & PCM_ENABLE_OUTPUT)) < 0)
+                    *_errno = EIO;
+                if (dsp_trigger(i) < 0)
+                    *_errno = EIO;
+            }
+
+            i->rec_precork = !((*(int*) argp) & PCM_ENABLE_INPUT);
+
+            if (i->rec_stream) {
+                if (dsp_cork(i, i->rec_stream, !((*(int*) argp) & PCM_ENABLE_INPUT)) < 0)
+                    *_errno = EIO;
+            }
+
+            break;
+
+        case SNDCTL_DSP_SYNC:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SYNC\n");
+
+            if (dsp_drain(i) < 0)
+                *_errno = EIO;
+
+            break;
+
+        case SNDCTL_DSP_GETOSPACE:
+        case SNDCTL_DSP_GETISPACE: {
+            audio_buf_info *bi = (audio_buf_info*) argp;
+            int l = 0;
+            size_t k = 0;
+
+            if (request == SNDCTL_DSP_GETOSPACE)
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETOSPACE\n");
+            else
+                debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETISPACE\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            fix_metrics(i);
+
+            if (request == SNDCTL_DSP_GETOSPACE) {
+                if (i->play_stream) {
+                    if ((k = pa_stream_writable_size(i->play_stream)) == (size_t) -1)
+                        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_writable_size(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                } else
+                    k = i->fragment_size * i->n_fragments;
+
+#ifdef SIOCINQ
+                if (ioctl(i->thread_fd, SIOCINQ, &l) < 0) {
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ failed: %s\n", strerror(errno));
+                    l = 0;
+                }
+#else
+# warning "Your platform does not dsp_flush_fd, something might not work as intended."
+#endif
+
+                bi->bytes = k > (size_t) l ? k - l : 0;
+            } else {
+                if (i->rec_stream) {
+                    if ((k = pa_stream_readable_size(i->rec_stream)) == (size_t) -1)
+                        debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_readable_size(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                } else
+                    k = 0;
+
+#ifdef SIOCINQ
+                if (ioctl(i->app_fd, SIOCINQ, &l) < 0) {
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ failed: %s\n", strerror(errno));
+                    l = 0;
+                }
+#else
+# warning "Your platform does not dsp_flush_fd, something might not work as intended."
+#endif
+                bi->bytes = k + l;
+            }
+
+            bi->fragsize = i->fragment_size;
+            bi->fragstotal = i->n_fragments;
+            bi->fragments = bi->bytes / bi->fragsize;
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": fragsize=%i, fragstotal=%i, bytes=%i, fragments=%i\n", bi->fragsize, bi->fragstotal, bi->bytes, bi->fragments);
+
+            break;
+        }
+
+        case SOUND_PCM_READ_RATE:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+            *(int*) argp = i->sample_spec.rate;
+            pa_threaded_mainloop_unlock(i->mainloop);
+            break;
+
+        case SOUND_PCM_READ_CHANNELS:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+            *(int*) argp = i->sample_spec.channels;
+            pa_threaded_mainloop_unlock(i->mainloop);
+            break;
+
+        case SOUND_PCM_READ_BITS:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n");
+
+            pa_threaded_mainloop_lock(i->mainloop);
+            *(int*) argp = pa_sample_size(&i->sample_spec)*8;
+            pa_threaded_mainloop_unlock(i->mainloop);
+            break;
+
+        case SNDCTL_DSP_GETOPTR: {
+            count_info *info;
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETOPTR\n");
+
+            info = (count_info*) argp;
+            memset(info, 0, sizeof(*info));
+
+            pa_threaded_mainloop_lock(i->mainloop);
+
+            for (;;) {
+                pa_usec_t usec;
+
+                PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, exit_loop);
+
+                if (pa_stream_get_time(i->play_stream, &usec) >= 0) {
+                    size_t k = pa_usec_to_bytes(usec, &i->sample_spec);
+                    int m;
+
+                    info->bytes = (int) k;
+                    m = k / i->fragment_size;
+                    info->blocks = m - i->optr_n_blocks;
+                    i->optr_n_blocks = m;
+
+                    break;
+                }
+
+                if (pa_context_errno(i->context) != PA_ERR_NODATA) {
+                    debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_get_latency(): %s\n", pa_strerror(pa_context_errno(i->context)));
+                    break;
+                }
+
+                pa_threaded_mainloop_wait(i->mainloop);
+            }
+
+            pa_threaded_mainloop_unlock(i->mainloop);
+
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": GETOPTR bytes=%i, blocks=%i, ptr=%i\n", info->bytes, info->blocks, info->ptr);
+
+            break;
+        }
+
+        case SNDCTL_DSP_GETIPTR:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": invalid ioctl SNDCTL_DSP_GETIPTR\n");
+            goto inval;
+
+        case SNDCTL_DSP_SETDUPLEX:
+            debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SETDUPLEX\n");
+            /* this is a no-op */
+            break;
+
+        default:
+            /* Mixer ioctls are valid on /dev/dsp aswell */
+            return mixer_ioctl(i, request, argp, _errno);
+
+inval:
+            *_errno = EINVAL;
+            goto fail;
+    }
+
+    ret = 0;
+
+fail:
+
+    return ret;
+}
+
+int ioctl(int fd, unsigned long request, ...) {
+    fd_info *i;
+    va_list args;
+    void *argp;
+    int r, _errno = 0;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": ioctl()\n");
+
+    va_start(args, request);
+    argp = va_arg(args, void *);
+    va_end(args);
+
+    if (!function_enter()) {
+        LOAD_IOCTL_FUNC();
+        return _ioctl(fd, request, argp);
+    }
+
+    if (!(i = fd_info_find(fd))) {
+        function_exit();
+        LOAD_IOCTL_FUNC();
+        return _ioctl(fd, request, argp);
+    }
+
+    if (i->type == FD_INFO_MIXER)
+        r = mixer_ioctl(i, request, argp, &_errno);
+    else
+        r = dsp_ioctl(i, request, argp, &_errno);
+
+    fd_info_unref(i);
+
+    if (_errno)
+        errno = _errno;
+
+    function_exit();
+
+    return r;
+}
+
+int close(int fd) {
+    fd_info *i;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": close()\n");
+
+    if (!function_enter()) {
+        LOAD_CLOSE_FUNC();
+        return _close(fd);
+    }
+
+    if (!(i = fd_info_find(fd))) {
+        function_exit();
+        LOAD_CLOSE_FUNC();
+        return _close(fd);
+    }
+
+    fd_info_remove_from_list(i);
+    fd_info_unref(i);
+
+    function_exit();
+
+    return 0;
+}
+
+int access(const char *pathname, int mode) {
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": access(%s)\n", pathname?pathname:"NULL");
+
+    if (!pathname ||
+        ( strcmp(pathname, "/dev/dsp") != 0 &&
+          strcmp(pathname, "/dev/adsp") != 0 &&
+          strcmp(pathname, "/dev/sndstat") != 0 &&
+          strcmp(pathname, "/dev/mixer") != 0 )) {
+        LOAD_ACCESS_FUNC();
+        return _access(pathname, mode);
+    }
+
+    if (mode & (W_OK | X_OK)) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": access(%s, %x) = EACCESS\n", pathname, mode);
+        errno = EACCES;
+        return -1;
+    }
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": access(%s, %x) = OK\n", pathname, mode);
+
+    return 0;
+}
+
+int stat(const char *pathname, struct stat *buf) {
+#ifdef HAVE_OPEN64
+    struct stat64 parent;
+#else
+    struct stat parent;
+#endif
+    int ret;
+
+    if (!pathname ||
+        !buf ||
+        ( strcmp(pathname, "/dev/dsp") != 0 &&
+          strcmp(pathname, "/dev/adsp") != 0 &&
+          strcmp(pathname, "/dev/sndstat") != 0 &&
+          strcmp(pathname, "/dev/mixer") != 0 )) {
+        debug(DEBUG_LEVEL_VERBOSE, __FILE__": stat(%s)\n", pathname?pathname:"NULL");
+        LOAD_STAT_FUNC();
+        return _stat(pathname, buf);
+    }
+
+    debug(DEBUG_LEVEL_NORMAL, __FILE__": stat(%s)\n", pathname);
+
+#ifdef _STAT_VER
+#ifdef HAVE_OPEN64
+    ret = __xstat64(_STAT_VER, "/dev", &parent);
+#else
+    ret = __xstat(_STAT_VER, "/dev", &parent);
+#endif
+#else
+#ifdef HAVE_OPEN64
+    ret = stat64("/dev", &parent);
+#else
+    ret = stat("/dev", &parent);
+#endif
+#endif
+
+    if (ret) {
+        debug(DEBUG_LEVEL_NORMAL, __FILE__": unable to stat \"/dev\"\n");
+        return -1;
+    }
+
+    buf->st_dev = parent.st_dev;
+    buf->st_ino = 0xDEADBEEF;   /* FIXME: Can we do this in a safe way? */
+    buf->st_mode = S_IFCHR | S_IRUSR | S_IWUSR;
+    buf->st_nlink = 1;
+    buf->st_uid = getuid();
+    buf->st_gid = getgid();
+    buf->st_rdev = 0x0E03;      /* FIXME: Linux specific */
+    buf->st_size = 0;
+    buf->st_atime = 1181557705;
+    buf->st_mtime = 1181557705;
+    buf->st_ctime = 1181557705;
+    buf->st_blksize = 1;
+    buf->st_blocks = 0;
+
+    return 0;
+}
+
+#ifdef HAVE_OPEN64
+
+int stat64(const char *pathname, struct stat64 *buf) {
+    struct stat oldbuf;
+    int ret;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": stat64(%s)\n", pathname?pathname:"NULL");
+
+    if (!pathname ||
+        !buf ||
+        ( strcmp(pathname, "/dev/dsp") != 0 &&
+          strcmp(pathname, "/dev/adsp") != 0 &&
+          strcmp(pathname, "/dev/sndstat") != 0 &&
+          strcmp(pathname, "/dev/mixer") != 0 )) {
+        LOAD_STAT64_FUNC();
+        return _stat64(pathname, buf);
+    }
+
+    ret = stat(pathname, &oldbuf);
+    if (ret)
+        return ret;
+
+    buf->st_dev = oldbuf.st_dev;
+    buf->st_ino = oldbuf.st_ino;
+    buf->st_mode = oldbuf.st_mode;
+    buf->st_nlink = oldbuf.st_nlink;
+    buf->st_uid = oldbuf.st_uid;
+    buf->st_gid = oldbuf.st_gid;
+    buf->st_rdev = oldbuf.st_rdev;
+    buf->st_size = oldbuf.st_size;
+    buf->st_atime = oldbuf.st_atime;
+    buf->st_mtime = oldbuf.st_mtime;
+    buf->st_ctime = oldbuf.st_ctime;
+    buf->st_blksize = oldbuf.st_blksize;
+    buf->st_blocks = oldbuf.st_blocks;
+
+    return 0;
+}
+
+int open64(const char *filename, int flags, ...) {
+    va_list args;
+    mode_t mode = 0;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": open64(%s)\n", filename?filename:"NULL");
+
+    if (flags & O_CREAT) {
+        va_start(args, flags);
+        if (sizeof(mode_t) < sizeof(int))
+            mode = va_arg(args, int);
+        else
+            mode = va_arg(args, mode_t);
+        va_end(args);
+    }
+
+    if (!filename ||
+        ( strcmp(filename, "/dev/dsp") != 0 &&
+          strcmp(filename, "/dev/adsp") != 0 &&
+          strcmp(filename, "/dev/sndstat") != 0 &&
+          strcmp(filename, "/dev/mixer") != 0 )) {
+        LOAD_OPEN64_FUNC();
+        return _open64(filename, flags, mode);
+    }
+
+    return real_open(filename, flags, mode);
+}
+
+#endif
+
+#ifdef _STAT_VER
+
+int __xstat(int ver, const char *pathname, struct stat *buf) {
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": __xstat(%s)\n", pathname?pathname:"NULL");
+
+    if (!pathname ||
+        !buf ||
+        ( strcmp(pathname, "/dev/dsp") != 0 &&
+          strcmp(pathname, "/dev/adsp") != 0 &&
+          strcmp(pathname, "/dev/sndstat") != 0 &&
+          strcmp(pathname, "/dev/mixer") != 0 )) {
+        LOAD_XSTAT_FUNC();
+        return ___xstat(ver, pathname, buf);
+    }
+
+    if (ver != _STAT_VER) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    return stat(pathname, buf);
+}
+
+#ifdef HAVE_OPEN64
+
+int __xstat64(int ver, const char *pathname, struct stat64 *buf) {
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": __xstat64(%s)\n", pathname?pathname:"NULL");
+
+    if (!pathname ||
+        !buf ||
+        ( strcmp(pathname, "/dev/dsp") != 0 &&
+          strcmp(pathname, "/dev/adsp") != 0 &&
+          strcmp(pathname, "/dev/sndstat") != 0 &&
+          strcmp(pathname, "/dev/mixer") != 0 )) {
+        LOAD_XSTAT64_FUNC();
+        return ___xstat64(ver, pathname, buf);
+    }
+
+    if (ver != _STAT_VER) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    return stat64(pathname, buf);
+}
+
+#endif
+
+#endif
+
+FILE* fopen(const char *filename, const char *mode) {
+    FILE *f = NULL;
+    int fd;
+    mode_t m;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen(%s)\n", filename?filename:"NULL");
+
+    if (!filename ||
+        !mode ||
+        ( strcmp(filename, "/dev/dsp") != 0 &&
+          strcmp(filename, "/dev/adsp") != 0 &&
+          strcmp(filename, "/dev/sndstat") != 0 &&
+          strcmp(filename, "/dev/mixer") != 0 )) {
+        LOAD_FOPEN_FUNC();
+        return _fopen(filename, mode);
+    }
+
+    switch (mode[0]) {
+    case 'r':
+        m = O_RDONLY;
+        break;
+    case 'w':
+    case 'a':
+        m = O_WRONLY;
+        break;
+    default:
+        errno = EINVAL;
+        return NULL;
+    }
+
+    if ((((mode[1] == 'b') || (mode[1] == 't')) && (mode[2] == '+')) || (mode[1] == '+'))
+        m = O_RDWR;
+
+    if ((fd = real_open(filename, m, 0)) < 0)
+        return NULL;
+
+    if (!(f = fdopen(fd, mode))) {
+        close(fd);
+        return NULL;
+    }
+
+    return f;
+}
+
+#ifdef HAVE_OPEN64
+
+FILE *fopen64(const char *filename, const char *mode) {
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen64(%s)\n", filename?filename:"NULL");
+
+    if (!filename ||
+        !mode ||
+        ( strcmp(filename, "/dev/dsp") != 0 &&
+          strcmp(filename, "/dev/adsp") != 0 &&
+          strcmp(filename, "/dev/sndstat") != 0 &&
+          strcmp(filename, "/dev/mixer") != 0 )) {
+        LOAD_FOPEN64_FUNC();
+        return _fopen64(filename, mode);
+    }
+
+    return fopen(filename, mode);
+}
+
+#endif
+
+int fclose(FILE *f) {
+    fd_info *i;
+
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": fclose()\n");
+
+    if (!function_enter()) {
+        LOAD_FCLOSE_FUNC();
+        return _fclose(f);
+    }
+
+    if (!(i = fd_info_find(fileno(f)))) {
+        function_exit();
+        LOAD_FCLOSE_FUNC();
+        return _fclose(f);
+    }
+
+    fd_info_remove_from_list(i);
+
+    /* Dirty trick to avoid that the fd is not freed twice, once by us
+     * and once by the real fclose() */
+    i->app_fd = -1;
+
+    fd_info_unref(i);
+
+    function_exit();
+
+    LOAD_FCLOSE_FUNC();
+    return _fclose(f);
+}
diff --git a/src/utils/paplay.c b/src/utils/paplay.c
new file mode 100644
index 00000000..fddbb18c
--- /dev/null
+++ b/src/utils/paplay.c
@@ -0,0 +1,435 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
+  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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <locale.h>
+
+#include <sndfile.h>
+
+#include <pulse/pulseaudio.h>
+
+#if PA_API_VERSION < 9
+#error Invalid PulseAudio API version
+#endif
+
+static pa_context *context = NULL;
+static pa_stream *stream = NULL;
+static pa_mainloop_api *mainloop_api = NULL;
+
+static char *stream_name = NULL, *client_name = NULL, *device = NULL;
+
+static int verbose = 0;
+static pa_volume_t volume = PA_VOLUME_NORM;
+
+static SNDFILE* sndfile = NULL;
+
+static pa_sample_spec sample_spec = { 0, 0, 0 };
+static pa_channel_map channel_map;
+static int channel_map_set = 0;
+
+static sf_count_t (*readf_function)(SNDFILE *_sndfile, void *ptr, sf_count_t frames) = NULL;
+
+/* A shortcut for terminating the application */
+static void quit(int ret) {
+    assert(mainloop_api);
+    mainloop_api->quit(mainloop_api, ret);
+}
+
+/* Connection draining complete */
+static void context_drain_complete(pa_context*c, void *userdata) {
+    pa_context_disconnect(c);
+}
+
+/* Stream draining complete */
+static void stream_drain_complete(pa_stream*s, int success, void *userdata) {
+    pa_operation *o;
+
+    if (!success) {
+        fprintf(stderr, "Failed to drain stream: %s\n", pa_strerror(pa_context_errno(context)));
+        quit(1);
+    }
+
+    if (verbose)
+        fprintf(stderr, "Playback stream drained.\n");
+
+    pa_stream_disconnect(stream);
+    pa_stream_unref(stream);
+    stream = NULL;
+
+    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
+        pa_context_disconnect(context);
+    else {
+        pa_operation_unref(o);
+
+        if (verbose)
+            fprintf(stderr, "Draining connection to server.\n");
+    }
+}
+
+/* This is called whenever new data may be written to the stream */
+static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
+    sf_count_t bytes;
+    void *data;
+    assert(s && length);
+
+    if (!sndfile)
+        return;
+
+    data = pa_xmalloc(length);
+
+    if (readf_function) {
+        size_t k = pa_frame_size(&sample_spec);
+
+        if ((bytes = readf_function(sndfile, data, length/k)) > 0)
+            bytes *= k;
+
+    } else
+        bytes = sf_read_raw(sndfile, data, length);
+
+    if (bytes > 0)
+        pa_stream_write(s, data, bytes, pa_xfree, 0, PA_SEEK_RELATIVE);
+    else
+        pa_xfree(data);
+
+    if (bytes < (sf_count_t) length) {
+        sf_close(sndfile);
+        sndfile = NULL;
+        pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL));
+    }
+}
+
+/* This routine is called whenever the stream state changes */
+static void stream_state_callback(pa_stream *s, void *userdata) {
+    assert(s);
+
+    switch (pa_stream_get_state(s)) {
+        case PA_STREAM_CREATING:
+        case PA_STREAM_TERMINATED:
+            break;
+
+        case PA_STREAM_READY:
+            if (verbose)
+                fprintf(stderr, "Stream successfully created\n");
+            break;
+
+        case PA_STREAM_FAILED:
+        default:
+            fprintf(stderr, "Stream errror: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
+            quit(1);
+    }
+}
+
+/* This is called whenever the context status changes */
+static void context_state_callback(pa_context *c, void *userdata) {
+    assert(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+
+        case PA_CONTEXT_READY: {
+            pa_cvolume cv;
+
+            assert(c && !stream);
+
+            if (verbose)
+                fprintf(stderr, "Connection established.\n");
+
+            stream = pa_stream_new(c, stream_name, &sample_spec, channel_map_set ? &channel_map : NULL);
+            assert(stream);
+
+            pa_stream_set_state_callback(stream, stream_state_callback, NULL);
+            pa_stream_set_write_callback(stream, stream_write_callback, NULL);
+            pa_stream_connect_playback(stream, device, NULL, 0, pa_cvolume_set(&cv, sample_spec.channels, volume), NULL);
+
+            break;
+        }
+
+        case PA_CONTEXT_TERMINATED:
+            quit(0);
+            break;
+
+        case PA_CONTEXT_FAILED:
+        default:
+            fprintf(stderr, "Connection failure: %s\n", pa_strerror(pa_context_errno(c)));
+            quit(1);
+    }
+}
+
+/* UNIX signal to quit recieved */
+static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
+    if (verbose)
+        fprintf(stderr, "Got SIGINT, exiting.\n");
+    quit(0);
+
+}
+
+static void help(const char *argv0) {
+
+    printf("%s [options] [FILE]\n\n"
+           "  -h, --help                            Show this help\n"
+           "      --version                         Show version\n\n"
+           "  -v, --verbose                         Enable verbose operation\n\n"
+           "  -s, --server=SERVER                   The name of the server to connect to\n"
+           "  -d, --device=DEVICE                   The name of the sink to connect to\n"
+           "  -n, --client-name=NAME                How to call this client on the server\n"
+           "      --stream-name=NAME                How to call this stream on the server\n"
+           "      --volume=VOLUME                   Specify the initial (linear) volume in range 0...65536\n"
+           "      --channel-map=CHANNELMAP          Set the channel map to the use\n",
+           argv0);
+}
+
+enum {
+    ARG_VERSION = 256,
+    ARG_STREAM_NAME,
+    ARG_VOLUME,
+    ARG_CHANNELMAP
+};
+
+int main(int argc, char *argv[]) {
+    pa_mainloop* m = NULL;
+    int ret = 1, r, c;
+    char *bn, *server = NULL;
+    const char *filename;
+    SF_INFO sfinfo;
+
+    static const struct option long_options[] = {
+        {"device",      1, NULL, 'd'},
+        {"server",      1, NULL, 's'},
+        {"client-name", 1, NULL, 'n'},
+        {"stream-name", 1, NULL, ARG_STREAM_NAME},
+        {"version",     0, NULL, ARG_VERSION},
+        {"help",        0, NULL, 'h'},
+        {"verbose",     0, NULL, 'v'},
+        {"volume",      1, NULL, ARG_VOLUME},
+        {"channel-map", 1, NULL, ARG_CHANNELMAP},
+        {NULL,          0, NULL, 0}
+    };
+
+    setlocale(LC_ALL, "");
+
+    if (!(bn = strrchr(argv[0], '/')))
+        bn = argv[0];
+    else
+        bn++;
+
+    while ((c = getopt_long(argc, argv, "d:s:n:hv", long_options, NULL)) != -1) {
+
+        switch (c) {
+            case 'h' :
+                help(bn);
+                ret = 0;
+                goto quit;
+
+            case ARG_VERSION:
+                printf("paplay "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
+                ret = 0;
+                goto quit;
+
+            case 'd':
+                pa_xfree(device);
+                device = pa_xstrdup(optarg);
+                break;
+
+            case 's':
+                pa_xfree(server);
+                server = pa_xstrdup(optarg);
+                break;
+
+            case 'n':
+                pa_xfree(client_name);
+                client_name = pa_xstrdup(optarg);
+                break;
+
+            case ARG_STREAM_NAME:
+                pa_xfree(stream_name);
+                stream_name = pa_xstrdup(optarg);
+                break;
+
+            case 'v':
+                verbose = 1;
+                break;
+
+            case ARG_VOLUME: {
+                int v = atoi(optarg);
+                volume = v < 0 ? 0 : v;
+                break;
+            }
+
+            case ARG_CHANNELMAP:
+                if (!pa_channel_map_parse(&channel_map, optarg)) {
+                    fprintf(stderr, "Invalid channel map\n");
+                    goto quit;
+                }
+
+                channel_map_set = 1;
+                break;
+
+            default:
+                goto quit;
+        }
+    }
+
+    filename = optind < argc ? argv[optind] : "STDIN";
+
+    memset(&sfinfo, 0, sizeof(sfinfo));
+
+    if (optind < argc)
+        sndfile = sf_open(filename, SFM_READ, &sfinfo);
+    else
+        sndfile = sf_open_fd(STDIN_FILENO, SFM_READ, &sfinfo, 0);
+
+    if (!sndfile) {
+        fprintf(stderr, "Failed to open file '%s'\n", filename);
+        goto quit;
+    }
+
+    sample_spec.rate = sfinfo.samplerate;
+    sample_spec.channels = sfinfo.channels;
+
+    readf_function = NULL;
+
+    switch (sfinfo.format & 0xFF) {
+        case SF_FORMAT_PCM_16:
+        case SF_FORMAT_PCM_U8:
+        case SF_FORMAT_PCM_S8:
+            sample_spec.format = PA_SAMPLE_S16NE;
+            readf_function = (sf_count_t (*)(SNDFILE *_sndfile, void *ptr, sf_count_t frames)) sf_readf_short;
+            break;
+
+        case SF_FORMAT_ULAW:
+            sample_spec.format = PA_SAMPLE_ULAW;
+            break;
+
+        case SF_FORMAT_ALAW:
+            sample_spec.format = PA_SAMPLE_ALAW;
+            break;
+
+        case SF_FORMAT_FLOAT:
+        case SF_FORMAT_DOUBLE:
+        default:
+            sample_spec.format = PA_SAMPLE_FLOAT32NE;
+            readf_function = (sf_count_t (*)(SNDFILE *_sndfile, void *ptr, sf_count_t frames)) sf_readf_float;
+            break;
+    }
+
+    assert(pa_sample_spec_valid(&sample_spec));
+
+    if (channel_map_set && channel_map.channels != sample_spec.channels) {
+        fprintf(stderr, "Channel map doesn't match file.\n");
+        goto quit;
+    }
+
+    if (!client_name) {
+        client_name = pa_locale_to_utf8(bn);
+        if (!client_name)
+            client_name = pa_utf8_filter(bn);
+    }
+
+    if (!stream_name) {
+        const char *n;
+
+        n = sf_get_string(sndfile, SF_STR_TITLE);
+
+        if (!n)
+            n = filename;
+
+        stream_name = pa_locale_to_utf8(n);
+        if (!stream_name)
+            stream_name = pa_utf8_filter(n);
+    }
+
+    if (verbose) {
+        char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
+        pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
+        fprintf(stderr, "Using sample spec '%s'\n", t);
+    }
+
+    /* Set up a new main loop */
+    if (!(m = pa_mainloop_new())) {
+        fprintf(stderr, "pa_mainloop_new() failed.\n");
+        goto quit;
+    }
+
+    mainloop_api = pa_mainloop_get_api(m);
+
+    r = pa_signal_init(mainloop_api);
+    assert(r == 0);
+    pa_signal_new(SIGINT, exit_signal_callback, NULL);
+#ifdef SIGPIPE
+    signal(SIGPIPE, SIG_IGN);
+#endif
+
+    /* Create a new connection context */
+    if (!(context = pa_context_new(mainloop_api, client_name))) {
+        fprintf(stderr, "pa_context_new() failed.\n");
+        goto quit;
+    }
+
+    pa_context_set_state_callback(context, context_state_callback, NULL);
+
+    /* Connect the context */
+    pa_context_connect(context, server, 0, NULL);
+
+    /* Run the main loop */
+    if (pa_mainloop_run(m, &ret) < 0) {
+        fprintf(stderr, "pa_mainloop_run() failed.\n");
+        goto quit;
+    }
+
+quit:
+    if (stream)
+        pa_stream_unref(stream);
+
+    if (context)
+        pa_context_unref(context);
+
+    if (m) {
+        pa_signal_done();
+        pa_mainloop_free(m);
+    }
+
+    pa_xfree(server);
+    pa_xfree(device);
+    pa_xfree(client_name);
+    pa_xfree(stream_name);
+
+    if (sndfile)
+        sf_close(sndfile);
+
+    return ret;
+}
diff --git a/src/utils/pasuspender.c b/src/utils/pasuspender.c
new file mode 100644
index 00000000..05d96a68
--- /dev/null
+++ b/src/utils/pasuspender.c
@@ -0,0 +1,318 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <getopt.h>
+
+#include <sndfile.h>
+
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
+
+#include <pulse/pulseaudio.h>
+#include <pulsecore/macro.h>
+
+#if PA_API_VERSION < 10
+#error Invalid PulseAudio API version
+#endif
+
+#define BUFSIZE 1024
+
+static pa_context *context = NULL;
+static pa_mainloop_api *mainloop_api = NULL;
+static char **child_argv = NULL;
+static int child_argc = 0;
+static pid_t child_pid = (pid_t) -1;
+static int child_ret = 0;
+static int dead = 1;
+
+static void quit(int ret) {
+    pa_assert(mainloop_api);
+    mainloop_api->quit(mainloop_api, ret);
+}
+
+
+static void context_drain_complete(pa_context *c, void *userdata) {
+    pa_context_disconnect(c);
+}
+
+static void drain(void) {
+    pa_operation *o;
+
+    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
+        pa_context_disconnect(context);
+    else
+        pa_operation_unref(o);
+}
+
+static void start_child(void) {
+
+    if ((child_pid = fork()) < 0) {
+
+        fprintf(stderr, "fork(): %s\n", strerror(errno));
+        quit(1);
+
+    } else if (child_pid == 0) {
+        /* Child */
+
+#ifdef __linux__
+        prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
+#endif
+
+        if (execvp(child_argv[0], child_argv) < 0)
+            fprintf(stderr, "execvp(): %s\n", strerror(errno));
+
+        _exit(1);
+
+    } else {
+
+        /* parent */
+        dead = 0;
+    }
+}
+
+static void suspend_complete(pa_context *c, int success, void *userdata) {
+    static int n = 0;
+
+    n++;
+
+    if (!success) {
+        fprintf(stderr, "Failure to suspend: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (n >= 2)
+        start_child();
+}
+
+static void resume_complete(pa_context *c, int success, void *userdata) {
+    static int n = 0;
+
+    n++;
+
+    if (!success) {
+        fprintf(stderr, "Failure to resume: %s\n", pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (n >= 2)
+        drain(); /* drain and quit */
+}
+
+static void context_state_callback(pa_context *c, void *userdata) {
+    pa_assert(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+
+        case PA_CONTEXT_READY:
+            if (pa_context_is_local(c)) {
+                pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, 1, suspend_complete, NULL));
+                pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, 1, suspend_complete, NULL));
+            } else {
+                fprintf(stderr, "WARNING: Sound server is not local, not suspending.\n");
+                start_child();
+            }
+
+            break;
+
+        case PA_CONTEXT_TERMINATED:
+            quit(0);
+            break;
+
+        case PA_CONTEXT_FAILED:
+        default:
+            fprintf(stderr, "Connection failure: %s\n", pa_strerror(pa_context_errno(c)));
+
+            pa_context_unref(context);
+            context = NULL;
+
+            if (child_pid == (pid_t) -1)
+                /* not started yet, then we do it now */
+                start_child();
+            else if (dead)
+                /* already started, and dead, so let's quit */
+                quit(1);
+
+            break;
+    }
+}
+
+static void sigint_callback(pa_mainloop_api *m, pa_signal_event *e, int sig, void *userdata) {
+    fprintf(stderr, "Got SIGINT, exiting.\n");
+    quit(0);
+}
+
+static void sigchld_callback(pa_mainloop_api *m, pa_signal_event *e, int sig, void *userdata) {
+    int status = 0;
+    pid_t p;
+
+    p = waitpid(-1, &status, WNOHANG);
+
+    if (p != child_pid)
+        return;
+
+    dead = 1;
+
+    if (WIFEXITED(status))
+        child_ret = WEXITSTATUS(status);
+    else if (WIFSIGNALED(status)) {
+        fprintf(stderr, "WARNING: Child process terminated by signal %u\n", WTERMSIG(status));
+        child_ret = 1;
+    }
+
+    if (context) {
+        if (pa_context_is_local(context)) {
+            /* A context is around, so let's resume */
+            pa_operation_unref(pa_context_suspend_sink_by_index(context, PA_INVALID_INDEX, 0, resume_complete, NULL));
+            pa_operation_unref(pa_context_suspend_source_by_index(context, PA_INVALID_INDEX, 0, resume_complete, NULL));
+        } else
+            drain();
+    } else
+        /* Hmm, no context here, so let's terminate right away */
+        quit(0);
+}
+
+static void help(const char *argv0) {
+
+    printf("%s [options] ... \n\n"
+           "  -h, --help                            Show this help\n"
+           "      --version                         Show version\n"
+           "  -s, --server=SERVER                   The name of the server to connect to\n\n",
+           argv0);
+}
+
+enum {
+    ARG_VERSION = 256
+};
+
+int main(int argc, char *argv[]) {
+    pa_mainloop* m = NULL;
+    int c, ret = 1;
+    char *server = NULL, *bn;
+
+    static const struct option long_options[] = {
+        {"server",      1, NULL, 's'},
+        {"version",     0, NULL, ARG_VERSION},
+        {"help",        0, NULL, 'h'},
+        {NULL,          0, NULL, 0}
+    };
+
+    if (!(bn = strrchr(argv[0], '/')))
+        bn = argv[0];
+    else
+        bn++;
+
+    while ((c = getopt_long(argc, argv, "s:h", long_options, NULL)) != -1) {
+        switch (c) {
+            case 'h' :
+                help(bn);
+                ret = 0;
+                goto quit;
+
+            case ARG_VERSION:
+                printf("pasuspender "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
+                ret = 0;
+                goto quit;
+
+            case 's':
+                pa_xfree(server);
+                server = pa_xstrdup(optarg);
+                break;
+
+            default:
+                goto quit;
+        }
+    }
+
+    child_argv = argv + optind;
+    child_argc = argc - optind;
+
+    if (child_argc <= 0) {
+        help(bn);
+        ret = 0;
+        goto quit;
+    }
+
+    if (!(m = pa_mainloop_new())) {
+        fprintf(stderr, "pa_mainloop_new() failed.\n");
+        goto quit;
+    }
+
+    pa_assert_se(mainloop_api = pa_mainloop_get_api(m));
+    pa_assert_se(pa_signal_init(mainloop_api) == 0);
+    pa_signal_new(SIGINT, sigint_callback, NULL);
+    pa_signal_new(SIGCHLD, sigchld_callback, NULL);
+#ifdef SIGPIPE
+    signal(SIGPIPE, SIG_IGN);
+#endif
+
+    if (!(context = pa_context_new(mainloop_api, bn))) {
+        fprintf(stderr, "pa_context_new() failed.\n");
+        goto quit;
+    }
+
+    pa_context_set_state_callback(context, context_state_callback, NULL);
+    pa_context_connect(context, server, PA_CONTEXT_NOAUTOSPAWN, NULL);
+
+    if (pa_mainloop_run(m, &ret) < 0) {
+        fprintf(stderr, "pa_mainloop_run() failed.\n");
+        goto quit;
+    }
+
+quit:
+    if (context)
+        pa_context_unref(context);
+
+    if (m) {
+        pa_signal_done();
+        pa_mainloop_free(m);
+    }
+
+    pa_xfree(server);
+
+    if (!dead)
+        kill(child_pid, SIGTERM);
+
+    return ret == 0 ? child_ret : ret;
+}
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
new file mode 100644
index 00000000..9a50f8ef
--- /dev/null
+++ b/src/utils/pax11publish.c
@@ -0,0 +1,222 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 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 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
+  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
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <getopt.h>
+#include <string.h>
+#include <assert.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#include <pulse/util.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/authkey.h>
+#include <pulsecore/native-common.h>
+#include <pulsecore/x11prop.h>
+
+#include "../pulse/client-conf.h"
+
+int main(int argc, char *argv[]) {
+    const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;
+    int c, ret = 1;
+    Display *d = NULL;
+    enum { DUMP, EXPORT, IMPORT, REMOVE } mode = DUMP;
+
+    while ((c = getopt(argc, argv, "deiD:S:O:I:c:hr")) != -1) {
+        switch (c) {
+            case 'D' :
+                dname = optarg;
+                break;
+            case 'h':
+                printf("%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n\n"
+                       " -d    Show current PulseAudio data attached to X11 display (default)\n"
+                       " -e    Export local PulseAudio data to X11 display\n"
+                       " -i    Import PulseAudio data from X11 display to local environment variables and cookie file.\n"
+                       " -r    Remove PulseAudio data from X11 display\n",
+                       pa_path_get_filename(argv[0]));
+                ret = 0;
+                goto finish;
+            case 'd':
+                mode = DUMP;
+                break;
+            case 'e':
+                mode = EXPORT;
+                break;
+            case 'i':
+                mode = IMPORT;
+                break;
+            case 'r':
+                mode = REMOVE;
+                break;
+            case 'c':
+                cookie_file = optarg;
+                break;
+            case 'I':
+                source = optarg;
+                break;
+            case 'O':
+                sink = optarg;
+                break;
+            case 'S':
+                server = optarg;
+                break;
+            default:
+                fprintf(stderr, "Failed to parse command line.\n");
+                goto finish;
+        }
+    }
+
+    if (!(d = XOpenDisplay(dname))) {
+        pa_log("XOpenDisplay() failed");
+        goto finish;
+    }
+
+    switch (mode) {
+        case DUMP: {
+            char t[1024];
+            if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t)))
+                printf("Server: %s\n", t);
+            if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t)))
+                printf("Source: %s\n", t);
+            if (pa_x11_get_prop(d, "PULSE_SINK", t, sizeof(t)))
+                printf("Sink: %s\n", t);
+            if (pa_x11_get_prop(d, "PULSE_COOKIE", t, sizeof(t)))
+                printf("Cookie: %s\n", t);
+
+            break;
+        }
+
+        case IMPORT: {
+            char t[1024];
+            if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t)))
+                printf("PULSE_SERVER='%s'\nexport PULSE_SERVER\n", t);
+            if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t)))
+                printf("PULSE_SOURCE='%s'\nexport PULSE_SOURCE\n", t);
+            if (pa_x11_get_prop(d, "PULSE_SINK", t, sizeof(t)))
+                printf("PULSE_SINK='%s'\nexport PULSE_SINK\n", t);
+
+            if (pa_x11_get_prop(d, "PULSE_COOKIE", t, sizeof(t))) {
+                uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
+                size_t l;
+                if ((l = pa_parsehex(t, cookie, sizeof(cookie))) != sizeof(cookie)) {
+                    fprintf(stderr, "Failed to parse cookie data\n");
+                    goto finish;
+                }
+
+                if (pa_authkey_save(cookie_file, cookie, l) < 0) {
+                    fprintf(stderr, "Failed to save cookie data\n");
+                    goto finish;
+                }
+            }
+
+            break;
+        }
+
+        case EXPORT: {
+            pa_client_conf *conf = pa_client_conf_new();
+            uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
+            char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
+            assert(conf);
+
+            if (pa_client_conf_load(conf, NULL) < 0) {
+                fprintf(stderr, "Failed to load client configuration file.\n");
+                goto finish;
+            }
+
+            if (pa_client_conf_env(conf) < 0) {
+                fprintf(stderr, "Failed to read environment configuration data.\n");
+                goto finish;
+            }
+
+            pa_x11_del_prop(d, "PULSE_SERVER");
+            pa_x11_del_prop(d, "PULSE_SINK");
+            pa_x11_del_prop(d, "PULSE_SOURCE");
+            pa_x11_del_prop(d, "PULSE_ID");
+            pa_x11_del_prop(d, "PULSE_COOKIE");
+
+            if (server)
+                pa_x11_set_prop(d, "PULSE_SERVER", server);
+            else if (conf->default_server)
+                pa_x11_set_prop(d, "PULSE_SERVER", conf->default_server);
+            else {
+                char hn[256];
+                if (!pa_get_fqdn(hn, sizeof(hn))) {
+                    fprintf(stderr, "Failed to get FQDN.\n");
+                    goto finish;
+                }
+
+                pa_x11_set_prop(d, "PULSE_SERVER", hn);
+            }
+
+            if (sink)
+                pa_x11_set_prop(d, "PULSE_SINK", sink);
+            else if (conf->default_sink)
+                pa_x11_set_prop(d, "PULSE_SINK", conf->default_sink);
+
+            if (source)
+                pa_x11_set_prop(d, "PULSE_SOURCE", source);
+            if (conf->default_source)
+                pa_x11_set_prop(d, "PULSE_SOURCE", conf->default_source);
+
+            pa_client_conf_free(conf);
+
+            if (pa_authkey_load_auto(cookie_file, cookie, sizeof(cookie)) < 0) {
+                fprintf(stderr, "Failed to load cookie data\n");
+                goto finish;
+            }
+
+            pa_x11_set_prop(d, "PULSE_COOKIE", pa_hexstr(cookie, sizeof(cookie), hx, sizeof(hx)));
+            break;
+        }
+
+        case REMOVE:
+            pa_x11_del_prop(d, "PULSE_SERVER");
+            pa_x11_del_prop(d, "PULSE_SINK");
+            pa_x11_del_prop(d, "PULSE_SOURCE");
+            pa_x11_del_prop(d, "PULSE_ID");
+            pa_x11_del_prop(d, "PULSE_COOKIE");
+            break;
+
+        default:
+            fprintf(stderr, "No yet implemented.\n");
+            goto finish;
+    }
+
+    ret = 0;
+
+finish:
+
+    if (d) {
+        XSync(d, False);
+        XCloseDisplay(d);
+    }
+
+    return ret;
+}