merge 'lennart' branch back into trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions

View file

@ -41,13 +41,14 @@
#include <pulsecore/mcalign.h>
#include <pulsecore/memblockq.h>
#include <pulsecore/hashmap.h>
#include <pulsecore/refcnt.h>
#include "client-conf.h"
#define DEFAULT_TIMEOUT (30)
struct pa_context {
int ref;
PA_REFCNT_DECLARE;
char *name;
pa_mainloop_api* mainloop;
@ -96,7 +97,7 @@ typedef struct pa_index_correction {
} pa_index_correction;
struct pa_stream {
int ref;
PA_REFCNT_DECLARE;
pa_context *context;
pa_mainloop_api *mainloop;
PA_LLIST_FIELDS(pa_stream);
@ -116,6 +117,7 @@ struct pa_stream {
uint32_t requested_bytes;
pa_memchunk peek_memchunk;
void *peek_data;
pa_memblockq *record_memblockq;
int corked;
@ -160,7 +162,8 @@ struct pa_stream {
typedef void (*pa_operation_cb_t)(void);
struct pa_operation {
int ref;
PA_REFCNT_DECLARE;
pa_context *context;
pa_stream *stream;