diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-06-17 23:43:50 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-06-17 23:43:50 +0200 |
commit | 53b87033aa04a504677d4c14b0b65caa58d16dbd (patch) | |
tree | 87bc32d0e83d8a9018fb10a7d308ae4a8ccf1f89 /src/modules/module-tunnel.c | |
parent | 550b619558f03fb9e6d5d8072b9a4b15d9e6f91f (diff) | |
parent | 75256fb671b6ae8d784e0d6415d292fdbc6482c2 (diff) |
Merge commit 'origin/master' into master-tx
Diffstat (limited to 'src/modules/module-tunnel.c')
-rw-r--r-- | src/modules/module-tunnel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c index 6f525da3..c493d9bb 100644 --- a/src/modules/module-tunnel.c +++ b/src/modules/module-tunnel.c @@ -730,7 +730,7 @@ static void command_request(pa_pdispatch *pd, uint32_t command, uint32_t tag, p } if (channel != u->channel) { - pa_log("Recieved data for invalid channel"); + pa_log("Received data for invalid channel"); goto fail; } @@ -1157,10 +1157,10 @@ static void sink_input_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag pa_cvolume_equal(&volume, &u->sink->virtual_volume)) return; - pa_sink_volume_changed(u->sink, &volume); + pa_sink_volume_changed(u->sink, &volume, FALSE); if (u->version >= 11) - pa_sink_mute_changed(u->sink, mute); + pa_sink_mute_changed(u->sink, mute, FALSE); return; @@ -1675,7 +1675,7 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t o pa_assert(u); if (channel != u->channel) { - pa_log("Recieved memory block on bad channel."); + pa_log("Received memory block on bad channel."); pa_module_unload_request(u->module, TRUE); return; } |