]> code.delx.au - pulseaudio/blobdiff - polyp/polyplib-introspect.c
Make the whole stuff LGPL only
[pulseaudio] / polyp / polyplib-introspect.c
index 35001d3d31d29d8445af21a8ffedcd32d8c5d3a0..f15f59cc87116fe58aa7d2b46ce04c57be841d3c 100644 (file)
@@ -4,7 +4,7 @@
   This file is part of polypaudio.
  
   polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
+  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.
  
@@ -13,7 +13,7 @@
   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 General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with polypaudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 #include <config.h>
 #endif
 
-#include <stdio.h>
 #include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#include "polyplib.h"
-#include "native-common.h"
-#include "pdispatch.h"
-#include "pstream.h"
-#include "dynarray.h"
-#include "socket-client.h"
-#include "pstream-util.h"
-#include "authkey.h"
-#include "util.h"
-#include "xmalloc.h"
-
-#define DEFAULT_MAXLENGTH 204800
-#define DEFAULT_TLENGTH 10240
-#define DEFAULT_PREBUF 4096
-#define DEFAULT_MINREQ 1024
-#define DEFAULT_FRAGSIZE 1024
-
-#define DEFAULT_TIMEOUT (5*60)
-#define DEFAULT_SERVER "/tmp/polypaudio/native"
-#define DEFAULT_PORT "4713"
-
-struct pa_context {
-    char *name;
-    struct pa_mainloop_api* mainloop;
-    struct pa_socket_client *client;
-    struct pa_pstream *pstream;
-    struct pa_pdispatch *pdispatch;
-    struct pa_dynarray *record_streams, *playback_streams;
-    struct pa_stream *first_stream;
-    uint32_t ctag;
-    uint32_t error;
-    enum {
-        CONTEXT_UNCONNECTED,
-        CONTEXT_CONNECTING,
-        CONTEXT_AUTHORIZING,
-        CONTEXT_SETTING_NAME,
-        CONTEXT_READY,
-        CONTEXT_DEAD
-    } state;
-
-    void (*connect_complete_callback)(struct pa_context*c, int success, void *userdata);
-    void *connect_complete_userdata;
-
-    void (*drain_complete_callback)(struct pa_context*c, void *userdata);
-    void *drain_complete_userdata;
-    
-    void (*die_callback)(struct pa_context*c, void *userdata);
-    void *die_userdata;
-
-    void (*stat_callback)(struct pa_context*c, uint32_t count, uint32_t total, void *userdata);
-    void *stat_userdata;
-
-    void (*play_sample_callback)(struct pa_context*c, int success, void *userdata);
-    void *play_sample_userdata;
-    
-    void (*remove_sample_callback)(struct pa_context*c, int success, void *userdata);
-    void *remove_sample_userdata;
-
-    void (*get_server_info_callback)(struct pa_context*c, const struct pa_server_info* i, void *userdata);
-    void *get_server_info_userdata;
-
-    void (*get_sink_info_callback)(struct pa_context*c, const struct pa_sink_info* i, int is_last, void *userdata);
-    void *get_sink_info_userdata;
-
-    void (*get_source_info_callback)(struct pa_context*c, const struct pa_source_info* i, int is_last, void *userdata);
-    void *get_source_info_userdata;
-
-    void (*subscribe_callback)(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata);
-    void *subscribe_userdata;
-    enum pa_subscription_mask subscribe_mask;
-
-    void (*get_client_info_callback)(struct pa_context*c, const struct pa_client_info* i, int is_last, void *userdata);
-    void *get_client_info_userdata;
-
-    void (*get_module_info_callback)(struct pa_context*c, const struct pa_module_info* i, int is_last, void *userdata);
-    void *get_module_info_userdata;
-
-    uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH];
-};
-
-struct pa_stream {
-    struct pa_context *context;
-    struct pa_stream *next, *previous;
 
-    char *name;
-    struct pa_buffer_attr buffer_attr;
-    struct pa_sample_spec sample_spec;
-    uint32_t channel;
-    int channel_valid;
-    uint32_t device_index;
-    enum pa_stream_direction direction;
-    
-    enum { STREAM_CREATING, STREAM_READY, STREAM_DEAD} state;
-    uint32_t requested_bytes;
-
-    void (*read_callback)(struct pa_stream *p, const void*data, size_t length, void *userdata);
-    void *read_userdata;
-
-    void (*write_callback)(struct pa_stream *p, size_t length, void *userdata);
-    void *write_userdata;
-    
-    void (*create_complete_callback)(struct pa_stream *s, int success, void *userdata);
-    void *create_complete_userdata;
-
-    void (*drain_complete_callback)(struct pa_stream *s, void *userdata);
-    void *drain_complete_userdata;
-    
-    void (*die_callback)(struct pa_stream*c, void *userdata);
-    void *die_userdata;
-
-    void (*get_latency_callback)(struct pa_stream*c, uint32_t latency, void *userdata);
-    void *get_latency_userdata;
-
-    void (*finish_sample_callback)(struct pa_stream*c, int success, void *userdata);
-    void *finish_sample_userdata;
-};
-
-static void command_request(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_playback_stream_killed(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_subscribe_event(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-
-static const struct pa_pdispatch_command command_table[PA_COMMAND_MAX] = {
-    [PA_COMMAND_ERROR] = { NULL },
-    [PA_COMMAND_REPLY] = { NULL },
-    [PA_COMMAND_CREATE_PLAYBACK_STREAM] = { NULL },
-    [PA_COMMAND_DELETE_PLAYBACK_STREAM] = { NULL },
-    [PA_COMMAND_CREATE_RECORD_STREAM] = { NULL },
-    [PA_COMMAND_DELETE_RECORD_STREAM] = { NULL },
-    [PA_COMMAND_EXIT] = { NULL },
-    [PA_COMMAND_REQUEST] = { command_request },
-    [PA_COMMAND_PLAYBACK_STREAM_KILLED] = { command_playback_stream_killed },
-    [PA_COMMAND_RECORD_STREAM_KILLED] = { command_playback_stream_killed },
-    [PA_COMMAND_SUBSCRIBE_EVENT] = { command_subscribe_event },
-};
-
-struct pa_context *pa_context_new(struct pa_mainloop_api *mainloop, const char *name) {
-    struct pa_context *c;
-    assert(mainloop && name);
-    
-    c = pa_xmalloc(sizeof(struct pa_context));
-    c->name = pa_xstrdup(name);
-    c->mainloop = mainloop;
-    c->client = NULL;
-    c->pstream = NULL;
-    c->pdispatch = NULL;
-    c->playback_streams = pa_dynarray_new();
-    assert(c->playback_streams);
-    c->record_streams = pa_dynarray_new();
-    assert(c->record_streams);
-    c->first_stream = NULL;
-    c->error = PA_ERROR_OK;
-    c->state = CONTEXT_UNCONNECTED;
-    c->ctag = 0;
-
-    c->connect_complete_callback = NULL;
-    c->connect_complete_userdata = NULL;
-
-    c->drain_complete_callback = NULL;
-    c->drain_complete_userdata = NULL;
-
-    c->die_callback = NULL;
-    c->die_userdata = NULL;
-
-    c->stat_callback = NULL;
-    c->stat_userdata = NULL;
+#include "polyplib-introspect.h"
+#include "polyplib-context.h"
+#include "polyplib-internal.h"
+#include "pstream-util.h"
 
-    c->play_sample_callback = NULL;
-    c->play_sample_userdata = NULL;
+/*** Statistics ***/
 
-    c->remove_sample_callback = NULL;
-    c->remove_sample_userdata = NULL;
+static void context_stat_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    struct pa_stat_info i, *p = &i;
+    assert(pd && o && o->context && o->ref >= 1);
 
-    c->get_server_info_callback = NULL;
-    c->get_server_info_userdata = NULL;
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-    c->get_sink_info_callback = NULL;
-    c->get_sink_info_userdata = NULL;
+        p = NULL;
+    } else if (pa_tagstruct_getu32(t, &i.memblock_total) < 0 ||
+               pa_tagstruct_getu32(t, &i.memblock_total_size) < 0 ||
+               pa_tagstruct_getu32(t, &i.memblock_allocated) < 0 ||
+               pa_tagstruct_getu32(t, &i.memblock_allocated_size) < 0 ||
+               pa_tagstruct_getu32(t, &i.scache_size) < 0 ||
+               !pa_tagstruct_eof(t)) {
+        pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+        goto finish;
+    }
 
-    c->get_source_info_callback = NULL;
-    c->get_source_info_userdata = NULL;
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_stat_info*i, void *userdata) = o->callback;
+        cb(o->context, p, o->userdata);
+    }
 
-    c->subscribe_callback = NULL;
-    c->subscribe_userdata = NULL;
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
+}
 
-    c->get_client_info_callback = NULL;
-    c->get_client_info_userdata = NULL;
-    
-    c->get_module_info_callback = NULL;
-    c->get_module_info_userdata = NULL;
-    
-    pa_check_for_sigpipe();
-    return c;
+struct pa_operation* pa_context_stat(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_stat_info*i, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_STAT, context_stat_callback, cb, userdata);
 }
 
-void pa_context_free(struct pa_context *c) {
-    assert(c);
+/*** Server Info ***/
 
-    while (c->first_stream)
-        pa_stream_free(c->first_stream);
-    
-    if (c->client)
-        pa_socket_client_free(c->client);
-    if (c->pdispatch)
-        pa_pdispatch_free(c->pdispatch);
-    if (c->pstream)
-        pa_pstream_free(c->pstream);
-    if (c->record_streams)
-        pa_dynarray_free(c->record_streams, NULL, NULL);
-    if (c->playback_streams)
-        pa_dynarray_free(c->playback_streams, NULL, NULL);
-        
-    pa_xfree(c->name);
-    pa_xfree(c);
-}
+static void context_get_server_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    struct pa_server_info i, *p = &i;
+    assert(pd && o && o->context && o->ref >= 1);
 
-static void stream_dead(struct pa_stream *s) {
-    assert(s);
-    
-    if (s->state == STREAM_DEAD)
-        return;
-    
-    if (s->state == STREAM_READY) {
-        s->state = STREAM_DEAD;
-        if (s->die_callback)
-            s->die_callback(s, s->die_userdata);
-    } else
-        s->state = STREAM_DEAD;
-}
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-static void context_dead(struct pa_context *c) {
-    struct pa_stream *s;
-    assert(c);
-    
-    if (c->state == CONTEXT_DEAD)
-        return;
+        p = NULL;
+    } else if (pa_tagstruct_gets(t, &i.server_name) < 0 ||
+               pa_tagstruct_gets(t, &i.server_version) < 0 ||
+               pa_tagstruct_gets(t, &i.user_name) < 0 ||
+               pa_tagstruct_gets(t, &i.host_name) < 0 ||
+               pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
+               pa_tagstruct_gets(t, &i.default_sink_name) < 0 ||
+               pa_tagstruct_gets(t, &i.default_source_name) < 0 ||
+               !pa_tagstruct_eof(t)) {
 
-    if (c->pdispatch)
-        pa_pdispatch_free(c->pdispatch);
-    c->pdispatch = NULL;
-    
-    if (c->pstream)
-        pa_pstream_free(c->pstream);
-    c->pstream = NULL;
-    
-    if (c->client)
-        pa_socket_client_free(c->client);
-    c->client = NULL;
+        pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+        goto finish;
+    }
     
-    for (s = c->first_stream; s; s = s->next)
-        stream_dead(s);
-
-    if (c->state == CONTEXT_READY) {
-        c->state = CONTEXT_DEAD;
-        if (c->die_callback)
-            c->die_callback(c, c->die_userdata);
-    } else
-        c->state = CONTEXT_DEAD;
-}
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_server_info*i, void *userdata) = o->callback;
+        cb(o->context, p, o->userdata);
+    }
 
-static void pstream_die_callback(struct pa_pstream *p, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(p && c);
-    c->error = PA_ERROR_CONNECTIONTERMINATED;
-    context_dead(c);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-static void pstream_packet_callback(struct pa_pstream *p, struct pa_packet *packet, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(p && packet && c);
-
-    if (pa_pdispatch_run(c->pdispatch, packet, c) < 0) {
-        fprintf(stderr, "polyp.c: invalid packet.\n");
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-    }
+struct pa_operation* pa_context_get_server_info(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_server_info*i, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_SERVER_INFO, context_get_server_info_callback, cb, userdata);
 }
 
-static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, int32_t delta, const struct pa_memchunk *chunk, void *userdata) {
-    struct pa_context *c = userdata;
-    struct pa_stream *s;
-    assert(p && chunk && c && chunk->memblock && chunk->memblock->data);
+/*** Sink Info ***/
 
-    if (!(s = pa_dynarray_get(c->record_streams, channel)))
-        return;
+static void context_get_sink_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
-    if (s->read_callback)
-        s->read_callback(s, chunk->memblock->data + chunk->index, chunk->length, s->read_userdata);
-}
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-static int handle_error(struct pa_context *c, uint32_t command, struct pa_tagstruct *t) {
-    assert(c && t);
-    
-    if (command == PA_COMMAND_ERROR) {
-        if (pa_tagstruct_getu32(t, &c->error) < 0) {
-            c->error = PA_ERROR_PROTOCOL;
-            return -1;
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_sink_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_gets(t, &i.description) < 0 ||
+                pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
+                pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
+                pa_tagstruct_getu32(t, &i.volume) < 0 ||
+                pa_tagstruct_getu32(t, &i.monitor_source) < 0 ||
+                pa_tagstruct_gets(t, &i.monitor_source_name) < 0 ||
+                pa_tagstruct_get_usec(t, &i.latency) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_sink_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
         }
-
-        return 0;
+    }
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_sink_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
     }
 
-    c->error = (command == PA_COMMAND_TIMEOUT) ? PA_ERROR_TIMEOUT : PA_ERROR_INTERNAL;
-    return -1;
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-static void setup_complete_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c && (c->state == CONTEXT_AUTHORIZING || c->state == CONTEXT_SETTING_NAME));
-
-    if (command != PA_COMMAND_REPLY) {
-        handle_error(c, command, t);
-        context_dead(c);
+struct pa_operation* pa_context_get_sink_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_sink_info *i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_SINK_INFO_LIST, context_get_sink_info_callback, cb, userdata);
+}
 
-        if (c->connect_complete_callback)
-            c->connect_complete_callback(c, 0, c->connect_complete_userdata);
-        
-        return;
-    }
+struct pa_operation* pa_context_get_sink_info_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_sink_info *i, int is_last, void *userdata), void *userdata) {
+    struct pa_tagstruct *t;
+    struct pa_operation *o;
+    uint32_t tag;
+    assert(c && cb);
 
-    if (c->state == CONTEXT_AUTHORIZING) {
-        struct pa_tagstruct *t;
-        c->state = CONTEXT_SETTING_NAME;
-        t = pa_tagstruct_new(NULL, 0);
-        assert(t);
-        pa_tagstruct_putu32(t, PA_COMMAND_SET_NAME);
-        pa_tagstruct_putu32(t, tag = c->ctag++);
-        pa_tagstruct_puts(t, c->name);
-        pa_pstream_send_tagstruct(c->pstream, t);
-        pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, setup_complete_callback, c);
-    } else {
-        assert(c->state == CONTEXT_SETTING_NAME);
-        
-        c->state = CONTEXT_READY;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-        if (c->connect_complete_callback) 
-            c->connect_complete_callback(c, 1, c->connect_complete_userdata);
-    }
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SINK_INFO);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
+    pa_tagstruct_puts(t, NULL);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sink_info_callback, o);
 
-    return;
+    return pa_operation_ref(o);
 }
 
-static void on_connection(struct pa_socket_client *client, struct pa_iochannel*io, void *userdata) {
-    struct pa_context *c = userdata;
+struct pa_operation* pa_context_get_sink_info_by_name(struct pa_context *c, const char *name, void (*cb)(struct pa_context *c, const struct pa_sink_info *i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(client && c && c->state == CONTEXT_CONNECTING);
-
-    pa_socket_client_free(client);
-    c->client = NULL;
-
-    if (!io) {
-        c->error = PA_ERROR_CONNECTIONREFUSED;
-        context_dead(c);
+    assert(c && cb);
 
-        if (c->connect_complete_callback)
-            c->connect_complete_callback(c, 0, c->connect_complete_userdata);
-
-        return;
-    }
-    
-    c->pstream = pa_pstream_new(c->mainloop, io);
-    assert(c->pstream);
-    pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);
-    pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c);
-    pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c);
-    
-    c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
-    assert(c->pdispatch);
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SINK_INFO);
     pa_tagstruct_putu32(t, tag = c->ctag++);
-    pa_tagstruct_put_arbitrary(t, c->auth_cookie, sizeof(c->auth_cookie));
+    pa_tagstruct_putu32(t, PA_INVALID_INDEX);
+    pa_tagstruct_puts(t, name);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, setup_complete_callback, c);
-    c->state = CONTEXT_AUTHORIZING;
-}
-
-static struct sockaddr *resolve_server(const char *server, size_t *len) {
-    struct sockaddr *sa;
-    struct addrinfo hints, *result = NULL;
-    char *port;
-    assert(server && len);
-
-    if ((port = strrchr(server, ':')))
-        port++;
-    if (!port)
-        port = DEFAULT_PORT;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = 0;
-
-    if (getaddrinfo(server, port, &hints, &result) != 0)
-        return NULL;
-    assert(result);
-    
-    sa = pa_xmalloc(*len = result->ai_addrlen);
-    memcpy(sa, result->ai_addr, *len);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sink_info_callback, o);
 
-    freeaddrinfo(result);
-    
-    return sa;
+    return pa_operation_ref(o);
 }
 
-int pa_context_connect(struct pa_context *c, const char *server, void (*complete) (struct pa_context*c, int success, void *userdata), void *userdata) {
-    assert(c && c->state == CONTEXT_UNCONNECTED);
+/*** Source info ***/
 
-    if (pa_authkey_load_from_home(PA_NATIVE_COOKIE_FILE, c->auth_cookie, sizeof(c->auth_cookie)) < 0) {
-        c->error = PA_ERROR_AUTHKEY;
-        return -1;
-    }
+static void context_get_source_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
-    if (!server)
-        if (!(server = getenv("POLYP_SERVER")))
-            server = DEFAULT_SERVER;
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-    assert(!c->client);
-    
-    if (*server == '/') {
-        if (!(c->client = pa_socket_client_new_unix(c->mainloop, server))) {
-            c->error = PA_ERROR_CONNECTIONREFUSED;
-            return -1;
-        }
+        eof = -1;
     } else {
-        struct sockaddr* sa;
-        size_t sa_len;
-
-        if (!(sa = resolve_server(server, &sa_len))) {
-            c->error = PA_ERROR_INVALIDSERVER;
-            return -1;
-        }
-
-        c->client = pa_socket_client_new_sockaddr(c->mainloop, sa, sa_len);
-        pa_xfree(sa);
-
-        if (!c->client) {
-            c->error = PA_ERROR_CONNECTIONREFUSED;
-            return -1;
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_source_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_gets(t, &i.description) < 0 ||
+                pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
+                pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
+                pa_tagstruct_getu32(t, &i.monitor_of_sink) < 0 ||
+                pa_tagstruct_gets(t, &i.monitor_of_sink_name) < 0 ||
+                pa_tagstruct_get_usec(t, &i.latency) < 0) {
+                
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_source_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
         }
     }
-
-    c->connect_complete_callback = complete;
-    c->connect_complete_userdata = userdata;
     
-    pa_socket_client_set_callback(c->client, on_connection, c);
-    c->state = CONTEXT_CONNECTING;
-
-    return 0;
-}
-
-int pa_context_is_dead(struct pa_context *c) {
-    assert(c);
-    return c->state == CONTEXT_DEAD;
-}
-
-int pa_context_is_ready(struct pa_context *c) {
-    assert(c);
-    return c->state == CONTEXT_READY;
-}
-
-int pa_context_errno(struct pa_context *c) {
-    assert(c);
-    return c->error;
-}
-
-void pa_context_set_die_callback(struct pa_context *c, void (*cb)(struct pa_context *c, void *userdata), void *userdata) {
-    assert(c);
-    c->die_callback = cb;
-    c->die_userdata = userdata;
-}
-
-static void command_playback_stream_killed(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    struct pa_stream *s;
-    uint32_t channel;
-    assert(pd && (command == PA_COMMAND_PLAYBACK_STREAM_KILLED || command == PA_COMMAND_RECORD_STREAM_KILLED) && t && c);
-
-    if (pa_tagstruct_getu32(t, &channel) < 0 ||
-        !pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_source_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
     }
-    
-    if (!(s = pa_dynarray_get(command == PA_COMMAND_PLAYBACK_STREAM_KILLED ? c->playback_streams : c->record_streams, channel)))
-        return;
 
-    c->error = PA_ERROR_KILLED;
-    stream_dead(s);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-static void command_request(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_stream *s;
-    struct pa_context *c = userdata;
-    uint32_t bytes, channel;
-    assert(pd && command == PA_COMMAND_REQUEST && t && c);
-
-    if (pa_tagstruct_getu32(t, &channel) < 0 ||
-        pa_tagstruct_getu32(t, &bytes) < 0 ||
-        !pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
-    }
-    
-    if (!(s = pa_dynarray_get(c->playback_streams, channel)))
-        return;
-
-    if (s->state != STREAM_READY)
-        return;
-    
-    s->requested_bytes += bytes;
-
-    if (s->requested_bytes && s->write_callback)
-        s->write_callback(s, s->requested_bytes, s->write_userdata);
+struct pa_operation* pa_context_get_source_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_source_info *i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_SOURCE_INFO_LIST, context_get_source_info_callback, cb, userdata);
 }
 
-static void create_stream_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_stream *s = userdata;
-    assert(pd && s && s->state == STREAM_CREATING);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(s->context, command, t) < 0) {
-            context_dead(s->context);
-            return;
-        }
-
-        stream_dead(s);
-        if (s->create_complete_callback)
-            s->create_complete_callback(s, 0, s->create_complete_userdata);
+struct pa_operation* pa_context_get_source_info_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_source_info *i, int is_last, void *userdata), void *userdata) {
+    struct pa_tagstruct *t;
+    struct pa_operation *o;
+    uint32_t tag;
+    assert(c && cb);
 
-        return;
-    }
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (pa_tagstruct_getu32(t, &s->channel) < 0 ||
-        ((s->direction != PA_STREAM_UPLOAD) && pa_tagstruct_getu32(t, &s->device_index) < 0) ||
-        !pa_tagstruct_eof(t)) {
-        s->context->error = PA_ERROR_PROTOCOL;
-        context_dead(s->context);
-        return;
-    }
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SOURCE_INFO);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
+    pa_tagstruct_puts(t, NULL);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_source_info_callback, o);
 
-    s->channel_valid = 1;
-    pa_dynarray_put((s->direction == PA_STREAM_RECORD) ? s->context->record_streams : s->context->playback_streams, s->channel, s);
-    
-    s->state = STREAM_READY;
-    if (s->create_complete_callback)
-        s->create_complete_callback(s, 1, s->create_complete_userdata);
+    return pa_operation_ref(o);
 }
 
-static void create_stream(struct pa_stream *s, const char *dev) {
+struct pa_operation* pa_context_get_source_info_by_name(struct pa_context *c, const char *name, void (*cb)(struct pa_context *c, const struct pa_source_info *i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(s);
+    assert(c && cb);
 
-    s->state = STREAM_CREATING;
-    
-    t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    
-    pa_tagstruct_putu32(t, s->direction == PA_STREAM_PLAYBACK ? PA_COMMAND_CREATE_PLAYBACK_STREAM : PA_COMMAND_CREATE_RECORD_STREAM);
-    pa_tagstruct_putu32(t, tag = s->context->ctag++);
-    pa_tagstruct_puts(t, s->name);
-    pa_tagstruct_put_sample_spec(t, &s->sample_spec);
-    pa_tagstruct_putu32(t, (uint32_t) -1);
-    pa_tagstruct_puts(t, dev ? dev : "");
-    pa_tagstruct_putu32(t, s->buffer_attr.maxlength);
-    if (s->direction == PA_STREAM_PLAYBACK) {
-        pa_tagstruct_putu32(t, s->buffer_attr.tlength);
-        pa_tagstruct_putu32(t, s->buffer_attr.prebuf);
-        pa_tagstruct_putu32(t, s->buffer_attr.minreq);
-    } else
-        pa_tagstruct_putu32(t, s->buffer_attr.fragsize);
-
-    pa_pstream_send_tagstruct(s->context->pstream, t);
-    pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, create_stream_callback, s);
-}
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-static struct pa_stream *internal_stream_new(struct pa_context *c) {
-    struct pa_stream *s;
-
-    s = pa_xmalloc(sizeof(struct pa_stream));
-    s->context = c;
-
-    s->read_callback = NULL;
-    s->read_userdata = NULL;
-    s->write_callback = NULL;
-    s->write_userdata = NULL;
-    s->die_callback = NULL;
-    s->die_userdata = NULL;
-    s->create_complete_callback = NULL;
-    s->create_complete_userdata = NULL;
-    s->get_latency_callback = NULL;
-    s->get_latency_userdata = NULL;
-    s->finish_sample_callback = NULL;
-    s->finish_sample_userdata = NULL;
-
-    s->name = NULL;
-    s->state = STREAM_CREATING;
-    s->requested_bytes = 0;
-    s->channel = 0;
-    s->channel_valid = 0;
-    s->device_index = (uint32_t) -1;
-
-    memset(&s->buffer_attr, 0, sizeof(s->buffer_attr));
-    
-    s->next = c->first_stream;
-    if (s->next)
-        s->next->previous = s;
-    s->previous = NULL;
-    c->first_stream = s;
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SOURCE_INFO);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, PA_INVALID_INDEX);
+    pa_tagstruct_puts(t, name);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_source_info_callback, o);
 
-    return s;
+    return pa_operation_ref(o);
 }
 
-struct pa_stream* pa_stream_new(
-    struct pa_context *c,
-    enum pa_stream_direction dir,
-    const char *dev,
-    const char *name,
-    const struct pa_sample_spec *ss,
-    const struct pa_buffer_attr *attr,
-    void (*complete) (struct pa_stream*s, int success, void *userdata),
-    void *userdata) {
-    
-    struct pa_stream *s;
-
-    assert(c && name && ss && c->state == CONTEXT_READY && (dir == PA_STREAM_PLAYBACK || dir == PA_STREAM_RECORD));
-
-    s = internal_stream_new(c);
-    assert(s);
-
-    s->create_complete_callback = complete;
-    s->create_complete_userdata = userdata;
-    s->name = pa_xstrdup(name);
-    s->state = STREAM_CREATING;
-    s->direction = dir;
-    s->sample_spec = *ss;
-    if (attr)
-        s->buffer_attr = *attr;
-    else {
-        s->buffer_attr.maxlength = DEFAULT_MAXLENGTH;
-        s->buffer_attr.tlength = DEFAULT_TLENGTH;
-        s->buffer_attr.prebuf = DEFAULT_PREBUF;
-        s->buffer_attr.minreq = DEFAULT_MINREQ;
-        s->buffer_attr.fragsize = DEFAULT_FRAGSIZE;
-    }
-
-    create_stream(s, dev);
-    
-    return s;
-}
+/*** Client info ***/
 
-void pa_stream_free(struct pa_stream *s) {
-    assert(s && s->context);
+static void context_get_client_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
-    if (s->context->pdispatch) 
-        pa_pdispatch_unregister_reply(s->context->pdispatch, s);
-    
-    pa_xfree(s->name);
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-    if (s->channel_valid && s->context->state == CONTEXT_READY) {
-        struct pa_tagstruct *t = pa_tagstruct_new(NULL, 0);
-        assert(t);
-    
-        pa_tagstruct_putu32(t, s->direction == PA_STREAM_PLAYBACK ? PA_COMMAND_DELETE_PLAYBACK_STREAM :
-                            (s->direction == PA_STREAM_RECORD ? PA_COMMAND_DELETE_RECORD_STREAM : PA_COMMAND_DELETE_UPLOAD_STREAM));
-        pa_tagstruct_putu32(t, s->context->ctag++);
-        pa_tagstruct_putu32(t, s->channel);
-        pa_pstream_send_tagstruct(s->context->pstream, t);
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_client_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_gets(t, &i.protocol_name) < 0 ||
+                pa_tagstruct_getu32(t, &i.owner_module) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_client_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
+        }
     }
     
-    if (s->channel_valid)
-        pa_dynarray_put((s->direction == PA_STREAM_PLAYBACK) ? s->context->playback_streams : s->context->record_streams, s->channel, NULL);
-
-    if (s->next)
-        s->next->previous = s->previous;
-    if (s->previous)
-        s->previous->next = s->next;
-    else
-        s->context->first_stream = s->next;
-    
-    pa_xfree(s);
-}
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_client_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
+    }
 
-void pa_stream_set_write_callback(struct pa_stream *s, void (*cb)(struct pa_stream *p, size_t length, void *userdata), void *userdata) {
-    s->write_callback = cb;
-    s->write_userdata = userdata;
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-void pa_stream_write(struct pa_stream *s, const void *data, size_t length) {
-    struct pa_memchunk chunk;
-    assert(s && s->context && data && length && s->state == STREAM_READY);
-
-    chunk.memblock = pa_memblock_new(length);
-    assert(chunk.memblock && chunk.memblock->data);
-    memcpy(chunk.memblock->data, data, length);
-    chunk.index = 0;
-    chunk.length = length;
-
-    pa_pstream_send_memblock(s->context->pstream, s->channel, 0, &chunk);
-    pa_memblock_unref(chunk.memblock);
+struct pa_operation* pa_context_get_client_info(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_client_info*i, int is_last, void *userdata), void *userdata) {
+    struct pa_tagstruct *t;
+    struct pa_operation *o;
+    uint32_t tag;
+    assert(c && cb);
 
-    /*fprintf(stderr, "Sent %u bytes\n", length);*/
-    
-    if (length < s->requested_bytes)
-        s->requested_bytes -= length;
-    else
-        s->requested_bytes = 0;
-}
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-size_t pa_stream_writable_size(struct pa_stream *s) {
-    assert(s && s->state == STREAM_READY);
-    return s->requested_bytes;
-}
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_CLIENT_INFO);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_client_info_callback, o);
 
-void pa_stream_set_read_callback(struct pa_stream *s, void (*cb)(struct pa_stream *p, const void*data, size_t length, void *userdata), void *userdata) {
-    assert(s && cb);
-    s->read_callback = cb;
-    s->read_userdata = userdata;
+    return pa_operation_ref(o);
 }
 
-int pa_stream_is_dead(struct pa_stream *s) {
-    return s->state == STREAM_DEAD;
+struct pa_operation* pa_context_get_client_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_client_info*i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_CLIENT_INFO_LIST, context_get_client_info_callback, cb, userdata);
 }
 
-int pa_stream_is_ready(struct pa_stream*s) {
-    return s->state == STREAM_READY;
-}
+/*** Module info ***/
 
-void pa_stream_set_die_callback(struct pa_stream *s, void (*cb)(struct pa_stream *s, void *userdata), void *userdata) {
-    assert(s);
-    s->die_callback = cb;
-    s->die_userdata = userdata;
-}
+static void context_get_module_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
-int pa_context_is_pending(struct pa_context *c) {
-    assert(c);
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-    if (c->state != CONTEXT_READY)
-        return 0;
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_module_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_gets(t, &i.argument) < 0 ||
+                pa_tagstruct_getu32(t, &i.n_used) < 0 ||
+                pa_tagstruct_get_boolean(t, &i.auto_unload) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_module_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
+        }
+    }
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_module_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
+    }
 
-    return pa_pstream_is_pending(c->pstream) || pa_pdispatch_is_pending(c->pdispatch);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-struct pa_context* pa_stream_get_context(struct pa_stream *p) {
-    assert(p);
-    return p->context;
-}
+struct pa_operation* pa_context_get_module_info(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_module_info*i, int is_last, void *userdata), void *userdata) {
+    struct pa_tagstruct *t;
+    struct pa_operation *o;
+    uint32_t tag;
+    assert(c && cb);
 
-static void set_dispatch_callbacks(struct pa_context *c);
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-static void pdispatch_drain_callback(struct pa_pdispatch*pd, void *userdata) {
-    set_dispatch_callbacks(userdata);
-}
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_MODULE_INFO);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_module_info_callback, o);
 
-static void pstream_drain_callback(struct pa_pstream *s, void *userdata) {
-    set_dispatch_callbacks(userdata);
+    return pa_operation_ref(o);
 }
 
-static void set_dispatch_callbacks(struct pa_context *c) {
-    assert(c && c->state == CONTEXT_READY);
-
-    pa_pstream_set_drain_callback(c->pstream, NULL, NULL);
-    pa_pdispatch_set_drain_callback(c->pdispatch, NULL, NULL);
-    
-    if (pa_pdispatch_is_pending(c->pdispatch)) {
-        pa_pdispatch_set_drain_callback(c->pdispatch, pdispatch_drain_callback, c);
-        return;
-    }
-
-    if (pa_pstream_is_pending(c->pstream)) {
-        pa_pstream_set_drain_callback(c->pstream, pstream_drain_callback, c);
-        return;
-    }
-
-    assert(c->drain_complete_callback);
-    c->drain_complete_callback(c, c->drain_complete_userdata);
+struct pa_operation* pa_context_get_module_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_module_info*i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_MODULE_INFO_LIST, context_get_module_info_callback, cb, userdata);
 }
 
-int pa_context_drain(
-    struct pa_context *c, 
-    void (*complete) (struct pa_context*c, void *userdata),
-    void *userdata) {
-
-    assert(c && c->state == CONTEXT_READY);
-
-    if (complete == NULL) {
-        c->drain_complete_callback = NULL;
-        pa_pstream_set_drain_callback(c->pstream, NULL, NULL);
-        pa_pdispatch_set_drain_callback(c->pdispatch, NULL, NULL);
-        return 0;
-    }
-    
-    if (!pa_context_is_pending(c))
-        return -1;
-    
-    c->drain_complete_callback = complete;
-    c->drain_complete_userdata = userdata;
+/*** Sink input info ***/
 
-    set_dispatch_callbacks(c);
+static void context_get_sink_input_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
-    return 0;
-}
-
-static void stream_drain_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_stream *s = userdata;
-    assert(pd && s);
-    
     if (command != PA_COMMAND_REPLY) {
-        if (handle_error(s->context, command, t) < 0) {
-            context_dead(s->context);
-            return;
-        }
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-        stream_dead(s);
-        return;
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_sink_input_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
+                pa_tagstruct_getu32(t, &i.client) < 0 ||
+                pa_tagstruct_getu32(t, &i.sink) < 0 ||
+                pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
+                pa_tagstruct_getu32(t, &i.volume) < 0 ||
+                pa_tagstruct_get_usec(t, &i.buffer_usec) < 0 ||
+                pa_tagstruct_get_usec(t, &i.sink_usec) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_sink_input_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
+        }
     }
-
-    if (s->state != STREAM_READY)
-        return;
-
-    if (!pa_tagstruct_eof(t)) {
-        s->context->error = PA_ERROR_PROTOCOL;
-        context_dead(s->context);
-        return;
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_sink_input_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
     }
 
-    if (s->drain_complete_callback) {
-        void (*temp) (struct pa_stream*s, void *userdata) = s->drain_complete_callback;
-        s->drain_complete_callback = NULL;
-        temp(s, s->drain_complete_userdata);
-    }
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-
-void pa_stream_drain(struct pa_stream *s, void (*complete) (struct pa_stream*s, void *userdata), void *userdata) {
+struct pa_operation* pa_context_get_sink_input_info(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_sink_input_info*i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(s && s->state == STREAM_READY);
-
-    if (!complete) {
-        s->drain_complete_callback = NULL;
-        return;
-    }
+    assert(c && cb);
 
-    s->drain_complete_callback = complete;
-    s->drain_complete_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    
-    pa_tagstruct_putu32(t, PA_COMMAND_DRAIN_PLAYBACK_STREAM);
-    pa_tagstruct_putu32(t, tag = s->context->ctag++);
-    pa_tagstruct_putu32(t, s->channel);
-    pa_pstream_send_tagstruct(s->context->pstream, t);
-    pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_drain_callback, s);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SINK_INPUT_INFO);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sink_input_info_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-void pa_context_exit(struct pa_context *c) {
-    struct pa_tagstruct *t;
-    t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_EXIT);
-    pa_tagstruct_putu32(t, c->ctag++);
-    pa_pstream_send_tagstruct(c->pstream, t);
+struct pa_operation* pa_context_get_sink_input_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_sink_input_info*i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_SINK_INPUT_INFO_LIST, context_get_sink_input_info_callback, cb, userdata);
 }
 
-static void context_stat_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    uint32_t total, count;
-    assert(pd && c);
+/*** Source output info ***/
+
+static void context_get_source_output_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
     if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-        if (c->stat_callback)
-            c->stat_callback(c, (uint32_t) -1, (uint32_t) -1, c->stat_userdata);
-        return;
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_source_output_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
+                pa_tagstruct_getu32(t, &i.client) < 0 ||
+                pa_tagstruct_getu32(t, &i.source) < 0 ||
+                pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
+                pa_tagstruct_get_usec(t, &i.buffer_usec) < 0 ||
+                pa_tagstruct_get_usec(t, &i.source_usec) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_source_output_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
+        }
     }
-
-    if (pa_tagstruct_getu32(t, &count) < 0 ||
-        pa_tagstruct_getu32(t, &total) < 0 ||
-        !pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_source_output_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
     }
 
-    if (c->stat_callback)
-        c->stat_callback(c, count, total, c->stat_userdata);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-void pa_context_stat(struct pa_context *c, void (*cb)(struct pa_context *c, uint32_t count, uint32_t total, void *userdata), void *userdata) {
-    uint32_t tag;
+struct pa_operation* pa_context_get_source_output_info(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_source_output_info*i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
+    uint32_t tag;
+    assert(c && cb);
 
-    c->stat_callback = cb;
-    c->stat_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (cb == NULL)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_STAT);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SOURCE_OUTPUT_INFO);
     pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_stat_callback, c);
-}
-
-static void stream_get_latency_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_stream *s = userdata;
-    uint32_t latency;
-    assert(pd && s);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(s->context, command, t) < 0) {
-            context_dead(s->context);
-            return;
-        }
-
-        if (s->get_latency_callback)
-            s->get_latency_callback(s, (uint32_t) -1, s->get_latency_userdata);
-        return;
-    }
-
-    if (pa_tagstruct_getu32(t, &latency) < 0 ||
-        !pa_tagstruct_eof(t)) {
-        s->context->error = PA_ERROR_PROTOCOL;
-        context_dead(s->context);
-        return;
-    }
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_source_output_info_callback, o);
 
-    if (s->get_latency_callback)
-        s->get_latency_callback(s, latency, s->get_latency_userdata);
+    return pa_operation_ref(o);
 }
 
-void pa_stream_get_latency(struct pa_stream *p, void (*cb)(struct pa_stream *p, uint32_t latency, void *userdata), void *userdata) {
-    uint32_t tag;
-    struct pa_tagstruct *t;
-
-    p->get_latency_callback = cb;
-    p->get_latency_userdata = userdata;
-
-    if (cb == NULL)
-        return;
-    
-    t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_PLAYBACK_LATENCY);
-    pa_tagstruct_putu32(t, tag = p->context->ctag++);
-    pa_tagstruct_putu32(t, p->channel);
-    pa_pstream_send_tagstruct(p->context->pstream, t);
-    pa_pdispatch_register_reply(p->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_get_latency_callback, p);
+struct pa_operation* pa_context_get_source_output_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_source_output_info*i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST, context_get_source_output_info_callback, cb, userdata);
 }
 
-struct pa_stream* pa_context_upload_sample(struct pa_context *c, const char *name, const struct pa_sample_spec *ss, size_t length, void (*cb) (struct pa_stream*s, int success, void *userdata), void *userdata) {
-    struct pa_stream *s;
+/*** Volume manipulation ***/
+
+struct pa_operation* pa_context_set_sink_volume_by_index(struct pa_context *c, uint32_t index, pa_volume_t volume, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    
-    s = internal_stream_new(c);
-    assert(s);
+    assert(c && index != PA_INVALID_INDEX);
 
-    s->create_complete_callback = cb;
-    s->create_complete_userdata = userdata;
-    s->name = pa_xstrdup(name);
-    s->state = STREAM_CREATING;
-    s->direction = PA_STREAM_UPLOAD;
-    s->sample_spec = *ss;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_CREATE_UPLOAD_STREAM);
+    pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_VOLUME);
     pa_tagstruct_putu32(t, tag = c->ctag++);
-    pa_tagstruct_puts(t, name);
-    pa_tagstruct_put_sample_spec(t, ss);
-    pa_tagstruct_putu32(t, length);
+    pa_tagstruct_putu32(t, index);
+    pa_tagstruct_puts(t, NULL);
+    pa_tagstruct_putu32(t, volume);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, create_stream_callback, s);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 
-    return s;
+    return pa_operation_ref(o);
 }
 
-static void stream_finish_sample_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_stream *s = userdata;
-    assert(pd && s);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(s->context, command, t) < 0) {
-            context_dead(s->context);
-            return;
-        }
-
-        if (s->finish_sample_callback)
-            s->finish_sample_callback(s, 0, s->finish_sample_userdata);
-        return;
-    }
-
-    if (!pa_tagstruct_eof(t)) {
-        s->context->error = PA_ERROR_PROTOCOL;
-        context_dead(s->context);
-        return;
-    }
-
-    if (s->finish_sample_callback)
-        s->finish_sample_callback(s, 1, s->finish_sample_userdata);
-}
-
-void pa_stream_finish_sample(struct pa_stream *p, void (*cb)(struct pa_stream*s, int success, void *userdata), void *userdata) {
+struct pa_operation* pa_context_set_sink_volume_by_name(struct pa_context *c, const char *name, pa_volume_t volume, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(p);
-
-    p->finish_sample_callback = cb;
-    p->finish_sample_userdata = userdata;
-    
-    t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_FINISH_UPLOAD_STREAM);
-    pa_tagstruct_putu32(t, tag = p->context->ctag++);
-    pa_tagstruct_putu32(t, p->channel);
-    pa_pstream_send_tagstruct(p->context->pstream, t);
-    pa_pdispatch_register_reply(p->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_finish_sample_callback, p);
-}
-
-static void context_play_sample_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
+    assert(c && name);
 
-        if (c->play_sample_callback)
-            c->play_sample_callback(c, 0, c->play_sample_userdata);
-        return;
-    }
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
-    }
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_VOLUME);
+    pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, PA_INVALID_INDEX);
+    pa_tagstruct_puts(t, name);
+    pa_tagstruct_putu32(t, volume);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 
-    if (c->play_sample_callback)
-        c->play_sample_callback(c, 1, c->play_sample_userdata);
+    return pa_operation_ref(o);
 }
 
-void pa_context_play_sample(struct pa_context *c, const char *name, const char *dev, uint32_t volume, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+struct pa_operation* pa_context_set_sink_input_volume(struct pa_context *c, uint32_t index, pa_volume_t volume, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(c && name && *name && (!dev || *dev));
+    assert(c && index != PA_INVALID_INDEX);
 
-    c->play_sample_callback = cb;
-    c->play_sample_userdata = userdata;
-
-    if (!cb)
-        return;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_PLAY_SAMPLE);
+    pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_INPUT_VOLUME);
     pa_tagstruct_putu32(t, tag = c->ctag++);
-    pa_tagstruct_putu32(t, (uint32_t) -1);
-    pa_tagstruct_puts(t, dev ? dev : "");
+    pa_tagstruct_putu32(t, index);
     pa_tagstruct_putu32(t, volume);
-    pa_tagstruct_puts(t, name);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_play_sample_callback, c);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-static void context_remove_sample_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c);
+/** Sample Cache **/
+
+static void context_get_sample_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
     if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-        if (c->remove_sample_callback)
-            c->remove_sample_callback(c, 0, c->remove_sample_userdata);
-        return;
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_sample_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_getu32(t, &i.volume) < 0 ||
+                pa_tagstruct_get_usec(t, &i.duration) < 0 ||
+                pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
+                pa_tagstruct_getu32(t, &i.bytes) < 0 ||
+                pa_tagstruct_get_boolean(t, &i.lazy) < 0 ||
+                pa_tagstruct_gets(t, &i.filename) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_sample_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
+        }
     }
-
-    if (!pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_sample_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
     }
 
-    if (c->remove_sample_callback)
-        c->remove_sample_callback(c, 1, c->remove_sample_userdata);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-void pa_context_remove_sample(struct pa_context *c, const char *name, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+struct pa_operation* pa_context_get_sample_info_by_name(struct pa_context *c, const char *name, void (*cb)(struct pa_context *c, const struct pa_sample_info *i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(c && name);
+    assert(c && cb && name);
+
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    c->remove_sample_callback = cb;
-    c->remove_sample_userdata = userdata;
-    
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_REMOVE_SAMPLE);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SAMPLE_INFO);
     pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, PA_INVALID_INDEX);
     pa_tagstruct_puts(t, name);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_remove_sample_callback, c);
-}
-
-static void context_get_server_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    struct pa_server_info i;
-    assert(pd && c);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sample_info_callback, o);
 
-        if (c->get_server_info_callback)
-            c->get_server_info_callback(c, NULL, c->get_server_info_userdata);
-        return;
-    }
-
-    if (pa_tagstruct_gets(t, &i.server_name) < 0 ||
-        pa_tagstruct_gets(t, &i.server_version) < 0 ||
-        pa_tagstruct_gets(t, &i.user_name) < 0 ||
-        pa_tagstruct_gets(t, &i.host_name) < 0 ||
-        pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
-        !pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
-    }
-
-    if (c->get_server_info_callback)
-        c->get_server_info_callback(c, &i, c->get_server_info_userdata);
+    return pa_operation_ref(o);
 }
 
-void pa_context_get_server_info(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_server_info*i, void *userdata), void *userdata) {
+struct pa_operation* pa_context_get_sample_info_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_sample_info *i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(c);
+    assert(c && cb);
 
-    c->get_server_info_callback = cb;
-    c->get_server_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_SERVER_INFO);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_SAMPLE_INFO);
     pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
+    pa_tagstruct_puts(t, NULL);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_server_info_callback, c);
-}
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sample_info_callback, o);
 
-static void context_get_sink_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
-
-        if (c->get_sink_info_callback)
-            c->get_sink_info_callback(c, NULL, 0, c->get_sink_info_userdata);
-        return;
-    }
-
-    while (!pa_tagstruct_eof(t)) {
-        struct pa_sink_info i;
-        
-        if (pa_tagstruct_getu32(t, &i.index) < 0 ||
-            pa_tagstruct_gets(t, &i.name) < 0 ||
-            pa_tagstruct_gets(t, &i.description) < 0 ||
-            pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
-            pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
-            pa_tagstruct_getu32(t, &i.volume) < 0 ||
-            pa_tagstruct_getu32(t, &i.monitor_source) < 0 ||
-            pa_tagstruct_gets(t, &i.monitor_source_name) < 0 ||
-            pa_tagstruct_getu32(t, &i.latency) < 0) {
-            c->error = PA_ERROR_PROTOCOL;
-            context_dead(c);
-            return;
-        }
-        
-        if (c->get_sink_info_callback)
-            c->get_sink_info_callback(c, &i, 0, c->get_sink_info_userdata);
-    }
+    return pa_operation_ref(o);
+}
 
-    if (c->get_sink_info_callback)
-        c->get_sink_info_callback(c, NULL, 1, c->get_sink_info_userdata);
+struct pa_operation* pa_context_get_sample_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_sample_info *i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_SAMPLE_INFO_LIST, context_get_sample_info_callback, cb, userdata);
 }
 
-void pa_context_get_sink_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_sink_info *i, int is_last, void *userdata), void *userdata) {
+static struct pa_operation* command_kill(struct pa_context *c, uint32_t command, uint32_t index, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(c);
+    assert(c && index != PA_INVALID_INDEX);
 
-    c->get_sink_info_callback = cb;
-    c->get_sink_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_SINK_INFO_LIST);
+    pa_tagstruct_putu32(t, command);
     pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_putu32(t, index);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sink_info_callback, c);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-static void context_get_source_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c);
+struct pa_operation* pa_context_kill_client(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    return command_kill(c, PA_COMMAND_KILL_CLIENT, index, cb, userdata);
+}
+                                            
+struct pa_operation* pa_context_kill_sink_input(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    return command_kill(c, PA_COMMAND_KILL_SINK_INPUT, index, cb, userdata);
+}
+
+struct pa_operation* pa_context_kill_source_output(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    return command_kill(c, PA_COMMAND_KILL_SOURCE_OUTPUT, index, cb, userdata);
+}
+
+static void load_module_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    uint32_t index = -1;
+    assert(pd && o && o->context && o->ref >= 1);
 
     if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-        if (c->get_source_info_callback)
-            c->get_source_info_callback(c, NULL, 0, c->get_source_info_userdata);
-        return;
+    } else if (pa_tagstruct_getu32(t, &index) < 0 ||
+               !pa_tagstruct_eof(t)) {
+        pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+        goto finish;
     }
-
-    while (!pa_tagstruct_eof(t)) {
-        struct pa_source_info i;
-
-        if (pa_tagstruct_getu32(t, &i.index) < 0 ||
-            pa_tagstruct_gets(t, &i.name) < 0 ||
-            pa_tagstruct_gets(t, &i.description) < 0 ||
-            pa_tagstruct_get_sample_spec(t, &i.sample_spec) < 0 ||
-            pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
-            pa_tagstruct_getu32(t, &i.monitor_of_sink) < 0 ||
-            pa_tagstruct_gets(t, &i.monitor_of_sink_name) < 0) {
-            c->error = PA_ERROR_PROTOCOL;
-            context_dead(c);
-            return;
-        }
-        
-        if (c->get_source_info_callback)
-            c->get_source_info_callback(c, &i, 0, c->get_source_info_userdata);
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *c, uint32_t index, void *userdata) = o->callback;
+        cb(o->context, index, o->userdata);
     }
 
-    if (c->get_source_info_callback)
-        c->get_source_info_callback(c, NULL, 1, c->get_source_info_userdata);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-void pa_context_get_source_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_source_info *i, int is_last, void *userdata), void *userdata) {
+struct pa_operation* pa_context_load_module(struct pa_context *c, const char*name, const char *argument, void (*cb)(struct pa_context *c, uint32_t index, void *userdata), void *userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(c);
+    assert(c && name && argument);
 
-    c->get_source_info_callback = cb;
-    c->get_source_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_SOURCE_INFO_LIST);
+    pa_tagstruct_putu32(t, PA_COMMAND_LOAD_MODULE);
     pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_puts(t, name);
+    pa_tagstruct_puts(t, argument);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_source_info_callback, c);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, load_module_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-void pa_context_subscribe(struct pa_context *c, enum pa_subscription_mask m, void (*cb)(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata), void *userdata) {
-    struct pa_tagstruct *t;
-    assert(c);
+struct pa_operation* pa_context_unload_module(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, int success, void *userdata), void *userdata) {
+    return command_kill(c, PA_COMMAND_UNLOAD_MODULE, index, cb, userdata);
+}
 
-    c->subscribe_callback = cb;
-    c->subscribe_userdata = userdata;
-    c->subscribe_mask = m;
+/*** Autoload stuff ***/
 
-    t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_SUBSCRIBE);
-    pa_tagstruct_putu32(t, c->ctag++);
-    pa_tagstruct_putu32(t, cb ? m : 0);
-    pa_pstream_send_tagstruct(c->pstream, t);
-}
+static void context_get_autoload_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    int eof = 1;
+    assert(pd && o && o->context && o->ref >= 1);
 
-static void command_subscribe_event(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    enum pa_subscription_event_type e;
-    uint32_t index;
-    assert(pd && command == PA_COMMAND_SUBSCRIBE_EVENT && t && c);
-
-    if (pa_tagstruct_getu32(t, &e) < 0 ||
-        pa_tagstruct_getu32(t, &index) < 0 ||
-        !pa_tagstruct_eof(t)) {
-        c->error = PA_ERROR_PROTOCOL;
-        context_dead(c);
-        return;
+    if (command != PA_COMMAND_REPLY) {
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
+
+        eof = -1;
+    } else {
+        
+        while (!pa_tagstruct_eof(t)) {
+            struct pa_autoload_info i;
+            
+            if (pa_tagstruct_getu32(t, &i.index) < 0 ||
+                pa_tagstruct_gets(t, &i.name) < 0 ||
+                pa_tagstruct_getu32(t, &i.type) < 0 ||
+                pa_tagstruct_gets(t, &i.module) < 0 ||
+                pa_tagstruct_gets(t, &i.argument) < 0) {
+                pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+                goto finish;
+            }
+
+            if (o->callback) {
+                void (*cb)(struct pa_context *s, const struct pa_autoload_info*i, int eof, void *userdata) = o->callback;
+                cb(o->context, &i, 0, o->userdata);
+            }
+        }
+    }
+    
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, const struct pa_autoload_info*i, int eof, void *userdata) = o->callback;
+        cb(o->context, NULL, eof, o->userdata);
     }
 
-    if (pa_subscription_match_flags(c->subscribe_mask, e) && c->subscribe_callback)
-        c->subscribe_callback(c, e, index, c->subscribe_userdata);
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
-void pa_context_get_sink_info_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_sink_info *i, int is_last, void *userdata), void *userdata) {
+struct pa_operation* pa_context_get_autoload_info_by_name(struct pa_context *c, const char *name, enum pa_autoload_type type, void (*cb)(struct pa_context *c, const struct pa_autoload_info *i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(c);
+    assert(c && cb && name);
 
-    c->get_sink_info_callback = cb;
-    c->get_sink_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_SINK_INFO);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_AUTOLOAD_INFO);
     pa_tagstruct_putu32(t, tag = c->ctag++);
-    pa_tagstruct_putu32(t, index);
-    pa_tagstruct_puts(t, "");
+    pa_tagstruct_puts(t, name);
+    pa_tagstruct_putu32(t, type);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_sink_info_callback, c);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_autoload_info_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-void pa_context_get_source_info_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_source_info *i, int is_last, void *userdata), void *userdata) {
+struct pa_operation* pa_context_get_autoload_info_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_autoload_info *i, int is_last, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
+    struct pa_operation *o;
     uint32_t tag;
-    assert(c);
+    assert(c && cb && index != PA_INVALID_INDEX);
 
-    c->get_source_info_callback = cb;
-    c->get_source_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_SOURCE_INFO);
+    pa_tagstruct_putu32(t, PA_COMMAND_GET_AUTOLOAD_INFO);
     pa_tagstruct_putu32(t, tag = c->ctag++);
     pa_tagstruct_putu32(t, index);
-    pa_tagstruct_puts(t, "");
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_source_info_callback, c);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_autoload_info_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-static void context_get_client_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c);
+struct pa_operation* pa_context_get_autoload_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_autoload_info *i, int is_last, void *userdata), void *userdata) {
+    return pa_context_send_simple_command(c, PA_COMMAND_GET_AUTOLOAD_INFO_LIST, context_get_autoload_info_callback, cb, userdata);
+}
+
+static void context_add_autoload_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+    struct pa_operation *o = userdata;
+    uint32_t index;
+    assert(pd && o && o->context && o->ref >= 1);
 
     if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
+        if (pa_context_handle_error(o->context, command, t) < 0)
+            goto finish;
 
-        if (c->get_client_info_callback)
-            c->get_client_info_callback(c, NULL, 0, c->get_client_info_userdata);
-        return;
+        index = PA_INVALID_INDEX;
+    } else if (pa_tagstruct_getu32(t, &index) ||
+               !pa_tagstruct_eof(t)) {
+        pa_context_fail(o->context, PA_ERROR_PROTOCOL);
+        goto finish;
     }
 
-    while (!pa_tagstruct_eof(t)) {
-        struct pa_client_info i;
-
-        if (pa_tagstruct_getu32(t, &i.index) < 0 ||
-            pa_tagstruct_gets(t, &i.name) < 0 ||
-            pa_tagstruct_gets(t, &i.protocol_name) < 0 ||
-            pa_tagstruct_getu32(t, &i.owner_module) < 0) {
-            c->error = PA_ERROR_PROTOCOL;
-            context_dead(c);
-            return;
-        }
-        
-        if (c->get_client_info_callback)
-            c->get_client_info_callback(c, &i, 0, c->get_client_info_userdata);
+    if (o->callback) {
+        void (*cb)(struct pa_context *s, uint32_t index, void *userdata) = o->callback;
+        cb(o->context, index, o->userdata);
     }
 
-    if (c->get_client_info_callback)
-        c->get_client_info_callback(c, NULL, 1, c->get_client_info_userdata);
+
+finish:
+    pa_operation_done(o);
+    pa_operation_unref(o);
 }
 
 
-void pa_context_get_client_info(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_client_info*i, int is_last, void *userdata), void *userdata) {
+struct pa_operation* pa_context_add_autoload(struct pa_context *c, const char *name, enum pa_autoload_type type, const char *module, const char*argument, void (*cb)(struct pa_context *c, int success, void *userdata), void* userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(c);
+    assert(c && name && module && argument);
 
-    c->get_client_info_callback = cb;
-    c->get_client_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_CLIENT_INFO);
+    pa_tagstruct_putu32(t, PA_COMMAND_ADD_AUTOLOAD);
     pa_tagstruct_putu32(t, tag = c->ctag++);
-    pa_tagstruct_putu32(t, index);
+    pa_tagstruct_puts(t, name);
+    pa_tagstruct_putu32(t, type);
+    pa_tagstruct_puts(t, module);
+    pa_tagstruct_puts(t, argument);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_client_info_callback, c);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_add_autoload_callback, o);
+
+    return pa_operation_ref(o);
 }
 
-void pa_context_get_client_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_client_info*i, int is_last, void *userdata), void *userdata) {
+struct pa_operation* pa_context_remove_autoload_by_name(struct pa_context *c, const char *name, enum pa_autoload_type type, void (*cb)(struct pa_context *c, int success, void *userdata), void* userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(c);
+    assert(c && name);
 
-    c->get_client_info_callback = cb;
-    c->get_client_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_CLIENT_INFO_LIST);
+    pa_tagstruct_putu32(t, PA_COMMAND_REMOVE_AUTOLOAD);
     pa_tagstruct_putu32(t, tag = c->ctag++);
+    pa_tagstruct_puts(t, name);
+    pa_tagstruct_putu32(t, type);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_client_info_callback, c);
-}
-
-static void context_get_module_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
-    struct pa_context *c = userdata;
-    assert(pd && c);
-
-    if (command != PA_COMMAND_REPLY) {
-        if (handle_error(c, command, t) < 0) {
-            context_dead(c);
-            return;
-        }
-
-        if (c->get_module_info_callback)
-            c->get_module_info_callback(c, NULL, 0, c->get_module_info_userdata);
-        return;
-    }
-
-    while (!pa_tagstruct_eof(t)) {
-        struct pa_module_info i;
-
-        if (pa_tagstruct_getu32(t, &i.index) < 0 ||
-            pa_tagstruct_gets(t, &i.name) < 0 ||
-            pa_tagstruct_gets(t, &i.argument) < 0 ||
-            pa_tagstruct_getu32(t, &i.n_used) < 0 ||
-            pa_tagstruct_getu32(t, &i.auto_unload) < 0) {
-            c->error = PA_ERROR_PROTOCOL;
-            context_dead(c);
-            return;
-        }
-        
-        if (c->get_module_info_callback)
-            c->get_module_info_callback(c, &i, 0, c->get_module_info_userdata);
-    }
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 
-    if (c->get_module_info_callback)
-        c->get_module_info_callback(c, NULL, 1, c->get_module_info_userdata);
+    return pa_operation_ref(o);
 }
 
-void pa_context_get_module_info(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, const struct pa_module_info*i, int is_last, void *userdata), void *userdata) {
+struct pa_operation* pa_context_remove_autoload_by_index(struct pa_context *c, uint32_t index, void (*cb)(struct pa_context *c, int success, void *userdata), void* userdata) {
+    struct pa_operation *o;
     struct pa_tagstruct *t;
     uint32_t tag;
-    assert(c);
+    assert(c && index != PA_INVALID_INDEX);
 
-    c->get_module_info_callback = cb;
-    c->get_module_info_userdata = userdata;
+    o = pa_operation_new(c, NULL);
+    o->callback = cb;
+    o->userdata = userdata;
 
-    if (!cb)
-        return;
-    
     t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_MODULE_INFO);
+    pa_tagstruct_putu32(t, PA_COMMAND_REMOVE_AUTOLOAD);
     pa_tagstruct_putu32(t, tag = c->ctag++);
     pa_tagstruct_putu32(t, index);
     pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_module_info_callback, c);
-}
-
-void pa_context_get_module_info_list(struct pa_context *c, void (*cb)(struct pa_context *c, const struct pa_module_info*i, int is_last, void *userdata), void *userdata) {
-    struct pa_tagstruct *t;
-    uint32_t tag;
-    assert(c);
-
-    c->get_module_info_callback = cb;
-    c->get_module_info_userdata = userdata;
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 
-    if (!cb)
-        return;
-    
-    t = pa_tagstruct_new(NULL, 0);
-    assert(t);
-    pa_tagstruct_putu32(t, PA_COMMAND_GET_MODULE_INFO_LIST);
-    pa_tagstruct_putu32(t, tag = c->ctag++);
-    pa_pstream_send_tagstruct(c->pstream, t);
-    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, context_get_module_info_callback, c);
+    return pa_operation_ref(o);
 }