summaryrefslogtreecommitdiffstats
path: root/src/modules/module-combine.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r--src/modules/module-combine.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 390b6e5c..dcdc954e 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -233,7 +233,7 @@ static void thread_func(void *userdata) {
pa_rtclock_get(&u->timestamp);
- /* This is only run when were are in NULL mode, to make sure that
+ /* This is only run when we are in NULL mode, to make sure that
* playback doesn't stop. In all other cases we hook our stuff
* into the master sink. */
@@ -1029,7 +1029,7 @@ int pa__init(pa_module*m) {
else
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_DEFAULT);
- if ((pa_modargs_get_channel_map(ma, &map) < 0)) {
+ if ((pa_modargs_get_channel_map(ma, NULL, &map) < 0)) {
pa_log("Invalid channel map.");
goto fail;
}