diff options
author | Lennart Poettering <lennart@poettering.net> | 2006-05-14 00:41:18 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2006-05-14 00:41:18 +0000 |
commit | be05b18c6fb6f0e2e2b74ffdf251692a45eaa045 (patch) | |
tree | 7974db8d050c3fd6e19dcd3aaa7dde5875f91168 /src/polypcore/sound-file-stream.c | |
parent | e46f8f8eb3fd586f8728e43292509434e0e8b089 (diff) |
* add new parameter to pa_open_config_file() to specify open mode
* modify pa_sink_input_new() to take initial volume settings as argument
* call pa_sink_input_set_volume() when changing stream volume in protocol-esound.c to make sure that subscribe events are issued properly
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@858 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/polypcore/sound-file-stream.c')
-rw-r--r-- | src/polypcore/sound-file-stream.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/polypcore/sound-file-stream.c b/src/polypcore/sound-file-stream.c index e242cfea..ca762d6a 100644 --- a/src/polypcore/sound-file-stream.c +++ b/src/polypcore/sound-file-stream.c @@ -158,11 +158,9 @@ int pa_play_file(pa_sink *sink, const char *fname, const pa_cvolume *volume) { goto fail; } - if (!(u->sink_input = pa_sink_input_new(sink, __FILE__, fname, &ss, NULL, 0, -1))) + if (!(u->sink_input = pa_sink_input_new(sink, __FILE__, fname, &ss, NULL, volume, 0, -1))) goto fail; - if (volume) - u->sink_input->volume = *volume; u->sink_input->peek = sink_input_peek; u->sink_input->drop = sink_input_drop; u->sink_input->kill = sink_input_kill; |