mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge glitch-free branch back into trunk

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 23:34:41 +00:00
parent 91f092eadc
commit 045c1d602d
189 changed files with 12559 additions and 4959 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/pulsecore/pstream.c
View file

@ -98,7 +98,7 @@ struct item_info {
/* packet info */
pa_packet *packet;
#ifdef HAVE_CREDS
int with_creds;
pa_bool_t with_creds;
pa_creds creds;
#endif
@ -121,7 +121,7 @@ struct pa_pstream {
pa_queue *send_queue;
int dead;
pa_bool_t dead;
struct {
pa_pstream_descriptor descriptor;
@ -141,7 +141,7 @@ struct pa_pstream {
size_t index;
} read;
int use_shm;
pa_bool_t use_shm;
pa_memimport *import;
pa_memexport *export;
@ -167,7 +167,7 @@ struct pa_pstream {
#ifdef HAVE_CREDS
pa_creds read_creds, write_creds;
int read_creds_valid, send_creds_now;
pa_bool_t read_creds_valid, send_creds_now;
#endif
};
@ -239,7 +239,7 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
PA_REFCNT_INIT(p);
p->io = io;
pa_iochannel_set_callback(io, io_callback, p);
p->dead = 0;
p->dead = FALSE;
p->mainloop = m;
p->defer_event = m->defer_new(m, defer_callback, p);
@ -269,18 +269,18 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
p->mempool = pool;
p->use_shm = 0;
p->use_shm = FALSE;
p->export = NULL;
/* We do importing unconditionally */
p->import = pa_memimport_new(p->mempool, memimport_release_cb, p);
pa_iochannel_socket_set_rcvbuf(io, 1024*8);
pa_iochannel_socket_set_sndbuf(io, 1024*8);
pa_iochannel_socket_set_rcvbuf(io, pa_mempool_block_size_max(p->mempool));
pa_iochannel_socket_set_sndbuf(io, pa_mempool_block_size_max(p->mempool));
#ifdef HAVE_CREDS
p->send_creds_now = 0;
p->read_creds_valid = 0;
p->send_creds_now = FALSE;
p->read_creds_valid = FALSE;
#endif
return p;
}
@ -374,7 +374,7 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
i = pa_xnew(struct item_info, 1);
i->type = PA_PSTREAM_ITEM_MEMBLOCK;
n = MIN(length, bsm);
n = PA_MIN(length, bsm);
i->chunk.index = chunk->index + idx;
i->chunk.length = n;
i->chunk.memblock = pa_memblock_ref(chunk->memblock);
@ -383,7 +383,7 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
i->offset = offset;
i->seek_mode = seek_mode;
#ifdef HAVE_CREDS
i->with_creds = 0;
i->with_creds = FALSE;
#endif
pa_queue_push(p->send_queue, i);
@ -410,7 +410,7 @@ void pa_pstream_send_release(pa_pstream *p, uint32_t block_id) {
item->type = PA_PSTREAM_ITEM_SHMRELEASE;
item->block_id = block_id;
#ifdef HAVE_CREDS
item->with_creds = 0;
item->with_creds = FALSE;
#endif
pa_queue_push(p->send_queue, item);
@ -447,7 +447,7 @@ void pa_pstream_send_revoke(pa_pstream *p, uint32_t block_id) {
item->type = PA_PSTREAM_ITEM_SHMREVOKE;
item->block_id = block_id;
#ifdef HAVE_CREDS
item->with_creds = 0;
item->with_creds = FALSE;
#endif
pa_queue_push(p->send_queue, item);
@ -504,7 +504,7 @@ static void prepare_next_write_item(pa_pstream *p) {
} else {
uint32_t flags;
int send_payload = 1;
pa_bool_t send_payload = TRUE;
pa_assert(p->write.current->type == PA_PSTREAM_ITEM_MEMBLOCK);
pa_assert(p->write.current->chunk.memblock);
@ -529,7 +529,7 @@ static void prepare_next_write_item(pa_pstream *p) {
&length) >= 0) {
flags |= PA_FLAG_SHMDATA;
send_payload = 0;
send_payload = FALSE;
p->write.shm_info[PA_PSTREAM_SHM_BLOCKID] = htonl(block_id);
p->write.shm_info[PA_PSTREAM_SHM_SHMID] = htonl(shm_id);
@ -599,7 +599,7 @@ static int do_write(pa_pstream *p) {
if ((r = pa_iochannel_write_with_creds(p->io, d, l, &p->write_creds)) < 0)
goto fail;
p->send_creds_now = 0;
p->send_creds_now = FALSE;
} else
#endif
@ -875,7 +875,7 @@ frame_done:
p->read.data = NULL;
#ifdef HAVE_CREDS
p->read_creds_valid = 0;
p->read_creds_valid = FALSE;
#endif
return 0;
@ -935,14 +935,14 @@ void pa_pstream_set_revoke_callback(pa_pstream *p, pa_pstream_block_id_cb_t cb,
p->release_callback_userdata = userdata;
}
int pa_pstream_is_pending(pa_pstream *p) {
int b;
pa_bool_t pa_pstream_is_pending(pa_pstream *p) {
pa_bool_t b;
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
if (p->dead)
b = 0;
b = FALSE;
else
b = p->write.current || !pa_queue_is_empty(p->send_queue);
@ -971,7 +971,7 @@ void pa_pstream_unlink(pa_pstream *p) {
if (p->dead)
return;
p->dead = 1;
p->dead = TRUE;
if (p->import) {
pa_memimport_free(p->import);
@ -999,7 +999,7 @@ void pa_pstream_unlink(pa_pstream *p) {
p->recieve_memblock_callback = NULL;
}
void pa_pstream_use_shm(pa_pstream *p, int enable) {
void pa_pstream_enable_shm(pa_pstream *p, pa_bool_t enable) {
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
@ -1018,3 +1018,10 @@ void pa_pstream_use_shm(pa_pstream *p, int enable) {
}
}
}
pa_bool_t pa_pstream_get_shm(pa_pstream *p) {
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
return p->use_shm;
}