]> code.delx.au - pulseaudio/commitdiff
use pa_channel_map_init_extend() instead of pa_channel_map_init_auto() as channel...
authorLennart Poettering <lennart@poettering.net>
Tue, 7 Oct 2008 20:45:37 +0000 (22:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 7 Oct 2008 20:45:37 +0000 (22:45 +0200)
src/pulsecore/sink-input.c
src/pulsecore/source-output.c

index 6dfbdbb042ef6c922df723b62d6a9adffd8ab9f5..6ef1e93d5f1773ea3cecfc28e2a445e7934ccc2b 100644 (file)
@@ -145,7 +145,7 @@ pa_sink_input* pa_sink_input_new(
         if (pa_channel_map_compatible(&data->sink->channel_map, &data->sample_spec))
             data->channel_map = data->sink->channel_map;
         else
-            pa_return_null_if_fail(pa_channel_map_init_auto(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT));
+            pa_channel_map_init_extend(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
     }
 
     pa_return_null_if_fail(pa_channel_map_valid(&data->channel_map));
index 6af78241aa9285cefefd64b1dc3722113b4127b3..7adc7572e4a070557b811c841cdda82f89c78ba2 100644 (file)
@@ -127,7 +127,7 @@ pa_source_output* pa_source_output_new(
         if (pa_channel_map_compatible(&data->source->channel_map, &data->sample_spec))
             data->channel_map = data->source->channel_map;
         else
-            pa_return_null_if_fail(pa_channel_map_init_auto(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT));
+            pa_channel_map_init_extend(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
     }
 
     pa_return_null_if_fail(pa_channel_map_valid(&data->channel_map));