mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow importing of external shm data blocks unconditionally, even when local SHM support is disabled

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1283 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-19 01:16:38 +00:00
parent 046bdd9b30
commit 206ac6f3ee
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pulsecore/pstream.c
View file

@ -251,7 +251,9 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
p->use_shm = 0; p->use_shm = 0;
p->export = NULL; p->export = NULL;
p->import = 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_rcvbuf(io, 1024*8);
pa_iochannel_socket_set_sndbuf(io, 1024*8); pa_iochannel_socket_set_sndbuf(io, 1024*8);
@ -567,7 +569,7 @@ static int do_read(pa_pstream *p) {
flags = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]); flags = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]);
if (!p->use_shm && (flags & PA_FLAG_SHMMASK) != 0) { if (!p->import && (flags & PA_FLAG_SHMMASK) != 0) {
pa_log_warn("Recieved SHM frame on a socket where SHM is disabled."); pa_log_warn("Recieved SHM frame on a socket where SHM is disabled.");
return -1; return -1;
} }
@ -861,19 +863,11 @@ void pa_pstream_use_shm(pa_pstream *p, int enable) {
if (enable) { if (enable) {
if (!p->import)
p->import = pa_memimport_new(p->mempool, memimport_release_cb, p);
if (!p->export) if (!p->export)
p->export = pa_memexport_new(p->mempool, memexport_revoke_cb, p); p->export = pa_memexport_new(p->mempool, memexport_revoke_cb, p);
} else { } else {
if (p->import) {
pa_memimport_free(p->import);
p->import = NULL;
}
if (p->export) { if (p->export) {
pa_memexport_free(p->export); pa_memexport_free(p->export);
p->export = NULL; p->export = NULL;