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

allow samples to be played with 'default' (i.e. unspecified) volume.

Browse source
This commit is contained in:
Lennart Poettering 2009-01-27 03:05:40 +01:00
parent 5449d793ae
commit 1be39e4fa5
6 changed files with 43 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,6 +137,7 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) {
pa_sample_spec_init(&e->sample_spec);
pa_channel_map_init(&e->channel_map);
pa_cvolume_init(&e->volume);
e->volume_is_set = FALSE;
pa_proplist_sets(e->proplist, PA_PROP_MEDIA_ROLE, "event");
@ -175,6 +176,7 @@ int pa_scache_add_item(
pa_sample_spec_init(&e->sample_spec);
pa_channel_map_init(&e->channel_map);
pa_cvolume_init(&e->volume);
e->volume_is_set = FALSE;
if (ss) {
e->sample_spec = *ss;
@ -308,6 +310,7 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
pa_scache_entry *e;
pa_cvolume r;
pa_proplist *merged;
pa_bool_t pass_volume;
pa_assert(c);
pa_assert(name);
@ -324,10 +327,12 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index);
if (pa_cvolume_valid(&e->volume))
pa_cvolume_remap(&e->volume, &old_channel_map, &e->channel_map);
else
pa_cvolume_reset(&e->volume, e->sample_spec.channels);
if (e->volume_is_set) {
if (pa_cvolume_valid(&e->volume))
pa_cvolume_remap(&e->volume, &old_channel_map, &e->channel_map);
else
pa_cvolume_reset(&e->volume, e->sample_spec.channels);
}
}
if (!e->memchunk.memblock)
@ -335,19 +340,26 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
pa_log_debug("Playing sample \"%s\" on \"%s\"", name, sink->name);
pa_cvolume_set(&r, e->volume.channels, volume);
pa_sw_cvolume_multiply(&r, &r, &e->volume);
pass_volume = TRUE;
if (e->volume_is_set && volume != (pa_volume_t) -1) {
pa_cvolume_set(&r, e->sample_spec.channels, volume);
pa_sw_cvolume_multiply(&r, &r, &e->volume);
} else if (e->volume_is_set)
r = e->volume;
else if (volume != (pa_volume_t) -1)
pa_cvolume_set(&r, e->sample_spec.channels, volume);
else
pass_volume = FALSE;
merged = pa_proplist_new();
pa_proplist_setf(merged, PA_PROP_MEDIA_NAME, "Sample %s", name);
pa_proplist_update(merged, PA_UPDATE_REPLACE, e->proplist);
if (p)
pa_proplist_update(merged, PA_UPDATE_REPLACE, p);
if (pa_play_memchunk(sink, &e->sample_spec, &e->channel_map, &e->memchunk, &r, merged, sink_input_idx) < 0) {
if (pa_play_memchunk(sink, &e->sample_spec, &e->channel_map, &e->memchunk, pass_volume ? &r : NULL, merged, sink_input_idx) < 0) {
pa_proplist_free(merged);
return -1;
}