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

scache: when playing a sample from the cache make sure not queue them up when the sink is suspended

Browse source 
libcanberra already sets the appropriate flags for uncached sample
streams, we now need to make sure to set them for cached samples too.
This commit is contained in:
Lennart Poettering 2010-02-21 17:35:05 +01:00
parent 3f1c90b9d7
commit ea29b11097
5 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pulsecore/core-scache.c
View file

@ -351,7 +351,12 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
if (p)
pa_proplist_update(merged, PA_UPDATE_REPLACE, p);
if (pa_play_memchunk(sink, &e->sample_spec, &e->channel_map, &e->memchunk, pass_volume ? &r : NULL, merged, sink_input_idx) < 0)
if (pa_play_memchunk(sink,
&e->sample_spec, &e->channel_map,
&e->memchunk,
pass_volume ? &r : NULL,
merged,
PA_SINK_INPUT_NO_CREATE_ON_SUSPEND|PA_SINK_INPUT_KILL_ON_SUSPEND, sink_input_idx) < 0)
goto fail;
pa_proplist_free(merged);

7
src/pulsecore/play-memblockq.c
View file

@ -173,7 +173,8 @@ pa_sink_input* pa_memblockq_sink_input_new(
const pa_channel_map *map,
pa_memblockq *q,
pa_cvolume *volume,
pa_proplist *p) {
pa_proplist *p,
pa_sink_input_flags_t flags) {
memblockq_stream *u = NULL;
pa_sink_input_new_data data;
@ -198,6 +199,7 @@ pa_sink_input* pa_memblockq_sink_input_new(
pa_sink_input_new_data_set_channel_map(&data, map);
pa_sink_input_new_data_set_volume(&data, volume);
pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p);
data.flags |= flags;
pa_sink_input_new(&u->sink_input, sink->core, &data);
pa_sink_input_new_data_done(&data);
@ -237,6 +239,7 @@ int pa_play_memblockq(
pa_memblockq *q,
pa_cvolume *volume,
pa_proplist *p,
pa_sink_input_flags_t flags,
uint32_t *sink_input_index) {
pa_sink_input *i;
@ -245,7 +248,7 @@ int pa_play_memblockq(
pa_assert(ss);
pa_assert(q);
if (!(i = pa_memblockq_sink_input_new(sink, ss, map, q, volume, p)))
if (!(i = pa_memblockq_sink_input_new(sink, ss, map, q, volume, p, flags)))
return -1;
pa_sink_input_put(i);

18
src/pulsecore/play-memblockq.h
View file

@ -31,17 +31,19 @@ pa_sink_input* pa_memblockq_sink_input_new(
const pa_channel_map *map,
pa_memblockq *q,
pa_cvolume *volume,
pa_proplist *p);
pa_proplist *p,
pa_sink_input_flags_t flags);
void pa_memblockq_sink_input_set_queue(pa_sink_input *i, pa_memblockq *q);
int pa_play_memblockq(
pa_sink *sink,
const pa_sample_spec *ss,
const pa_channel_map *map,
pa_memblockq *q,
pa_cvolume *cvolume,
pa_proplist *p,
uint32_t *sink_input_index);
pa_sink *sink,
const pa_sample_spec *ss,
const pa_channel_map *map,
pa_memblockq *q,
pa_cvolume *cvolume,
pa_proplist *p,
pa_sink_input_flags_t flags,
uint32_t *sink_input_index);
#endif

3
src/pulsecore/play-memchunk.c
View file

@ -43,6 +43,7 @@ int pa_play_memchunk(
const pa_memchunk *chunk,
pa_cvolume *volume,
pa_proplist *p,
pa_sink_input_flags_t flags,
uint32_t *sink_input_index) {
pa_memblockq *q;
@ -59,7 +60,7 @@ int pa_play_memchunk(
pa_assert_se(pa_memblockq_push(q, chunk) >= 0);
if ((r = pa_play_memblockq(sink, ss, map, q, volume, p, sink_input_index)) < 0) {
if ((r = pa_play_memblockq(sink, ss, map, q, volume, p, flags, sink_input_index)) < 0) {
pa_memblockq_free(q);
return r;
}

15
src/pulsecore/play-memchunk.h
View file

@ -26,12 +26,13 @@
#include <pulsecore/memchunk.h>
int pa_play_memchunk(
pa_sink *sink,
const pa_sample_spec *ss,
const pa_channel_map *map,
const pa_memchunk *chunk,
pa_cvolume *cvolume,
pa_proplist *p,
uint32_t *sink_input_index);
pa_sink *sink,
const pa_sample_spec *ss,
const pa_channel_map *map,
const pa_memchunk *chunk,
pa_cvolume *cvolume,
pa_proplist *p,
pa_sink_input_flags_t flags,
uint32_t *sink_input_index);
#endif