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

fix x11 build

Browse source 
disable prebuf on drain


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@136 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-08-17 18:53:42 +00:00
parent 2d6d3e5c47
commit 81822a7519
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
polyp/Makefile.am
View file

@ -272,7 +272,7 @@ if !X_DISPLAY_MISSING
module_x11_bell_la_SOURCES = module-x11-bell.c module_x11_bell_la_SOURCES = module-x11-bell.c
module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
module_x11_bell_la_LDFLAGS = -module -avoid-version module_x11_bell_la_LDFLAGS = -module -avoid-version
module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIB) module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIB)
endif endif
libpolyp_la_SOURCES = polyplib.h \ libpolyp_la_SOURCES = polyplib.h \

5
polyp/memblockq.c
View file

@ -323,3 +323,8 @@ uint32_t pa_memblockq_get_minreq(struct pa_memblockq *bq) {
assert(bq); assert(bq);
return bq->minreq; return bq->minreq;
} }
void pa_memblockq_prebuf_disable(struct pa_memblockq *bq) {
assert(bq);
bq->prebuf = 0;
}

5
polyp/memblockq.h
View file

@ -76,7 +76,10 @@ uint32_t pa_memblockq_get_length(struct pa_memblockq *bq);
/* Return how many bytes are missing in queue to the specified fill amount */ /* Return how many bytes are missing in queue to the specified fill amount */
uint32_t pa_memblockq_missing(struct pa_memblockq *bq); uint32_t pa_memblockq_missing(struct pa_memblockq *bq);
/* Returns the minimal request value */
uint32_t pa_memblockq_get_minreq(struct pa_memblockq *bq); uint32_t pa_memblockq_get_minreq(struct pa_memblockq *bq);
/* Force disabling of pre-buf even when the pre-buffer is not yet filled */
void pa_memblockq_prebuf_disable(struct pa_memblockq *bq);
#endif #endif

5
polyp/pacat.c
View file

@ -113,16 +113,13 @@ static void stream_state_callback(struct pa_stream *s, void *userdata) {
switch (pa_stream_get_state(s)) { switch (pa_stream_get_state(s)) {
case PA_STREAM_CREATING: case PA_STREAM_CREATING:
case PA_STREAM_TERMINATED:
break; break;
case PA_STREAM_READY: case PA_STREAM_READY:
fprintf(stderr, "Stream successfully created\n"); fprintf(stderr, "Stream successfully created\n");
break; break;
case PA_STREAM_TERMINATED:
quit(0);
break;
case PA_STREAM_FAILED: case PA_STREAM_FAILED:
default: default:
fprintf(stderr, "Stream errror: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s)))); fprintf(stderr, "Stream errror: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));

4
polyp/protocol-native.c
View file

@ -748,12 +748,16 @@ static void command_drain_playback_stream(struct pa_pdispatch *pd, uint32_t comm
} }
s->drain_request = 0; s->drain_request = 0;
pa_memblockq_prebuf_disable(s->memblockq);
if (!pa_memblockq_is_readable(s->memblockq)) if (!pa_memblockq_is_readable(s->memblockq))
pa_pstream_send_simple_ack(c->pstream, tag); pa_pstream_send_simple_ack(c->pstream, tag);
else { else {
s->drain_request = 1; s->drain_request = 1;
s->drain_tag = tag; s->drain_tag = tag;
pa_sink_notify(s->sink_input->sink);
} }
} }