diff options
author | Lennart Poettering <lennart@poettering.net> | 2006-04-23 19:49:01 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2006-04-23 19:49:01 +0000 |
commit | 335e23473fee2a6e40f838cd920ed13af3f93626 (patch) | |
tree | be9f74e470741060b08db89a9d90727bb0197925 /src/polypcore/protocol-esound.c | |
parent | 4e61ebb981b218637685d7edbf7faac89916a094 (diff) |
* when playing back a sample from the sample cache, just take a pa_volume_t and not a pa_cvolume_t as argument for the volume. Usually it is not known to the player of theses samples how many channels it has, hence it doesn't make any sense to allow him to pass a by-channel volume structure here.
* fix volume calculation when playing samples from the sample cache
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@784 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/polypcore/protocol-esound.c')
-rw-r--r-- | src/polypcore/protocol-esound.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c index e29c44c9..2c956a7e 100644 --- a/src/polypcore/protocol-esound.c +++ b/src/polypcore/protocol-esound.c @@ -742,7 +742,7 @@ static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t reque pa_sink *sink; if ((sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) - if (pa_scache_play_item(c->protocol->core, name, sink, NULL) >= 0) + if (pa_scache_play_item(c->protocol->core, name, sink, PA_VOLUME_NORM) >= 0) ok = idx + 1; } else { assert(request == ESD_PROTO_SAMPLE_FREE); |