diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-30 20:07:31 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-30 20:07:31 +0300 |
commit | 0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2 (patch) | |
tree | 42c290cd1f1c05c687d8134e40b63244d4fba4e9 /src/pulsecore/protocol-http.c | |
parent | 0e096632c53b746b9f4b4c0249d9e5a18c1c543d (diff) | |
parent | 8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd (diff) |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/modules/module-stream-restore.c
Diffstat (limited to 'src/pulsecore/protocol-http.c')
-rw-r--r-- | src/pulsecore/protocol-http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c index 5220cc91..c09e5348 100644 --- a/src/pulsecore/protocol-http.c +++ b/src/pulsecore/protocol-http.c @@ -533,7 +533,7 @@ static void handle_listen_prefix(struct connection *c, const char *source_name) pa_source_output_new_data_set_sample_spec(&data, &ss); pa_source_output_new_data_set_channel_map(&data, &cm); - pa_source_output_new(&c->source_output, c->protocol->core, &data, 0); + pa_source_output_new(&c->source_output, c->protocol->core, &data); pa_source_output_new_data_done(&data); if (!c->source_output) { |